MAGETWO-53424: Added additional arguments into attributes creation

Author: akaplya

app/code/Magento/Store/Model/StoreScopeProvider.php

@@ -50,7 +50,11 @@ public function getContext($entityType, $entityData = [])
         if (isset($entityData[Store::STORE_ID])) {
             $value = $entityData[Store::STORE_ID];
         } else {
-            $value = (int)$this->storeManager->getStore(true)->getId();
+            if ($this->storeManager->hasSingleStore()) {
+                $value = Store::DEFAULT_STORE_ID;
+            } else {
+                $value = (int)$this->storeManager->getStore(true)->getId();
+            }
         }
 
         $identifier = Store::STORE_ID;

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php

@@ -99,11 +99,10 @@ public function testReindexFull()
 
         $this->indexerBuilder->reindexFull();
 
-        $this->assertEquals(9.8, $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->product->getId()));
-        $this->assertEquals(
-            9.8,
-            $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productSecond->getId())
-        );
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->product->getId());
+        $this->assertEquals(9.8, $rulePrice);
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productSecond->getId());
+        $this->assertEquals(9.8, $rulePrice);
         $this->assertFalse($this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productThird->getId()));
     }