Merge branch 'MAGETWO-53424' of github.com:magento-firedrakes/magento2ce into MAGETWO-53424

Author: mlogvin

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

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

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()));
     }
 
@@ -113,7 +112,7 @@ protected function prepareProducts()
         $product->load($product->getId());
         $this->product = $product;
 
-        $this->product->setData('test_attribute', 'test_attribute_value')->save();
+        $this->product->setStoreId(0)->setData('test_attribute', 'test_attribute_value')->save();
         $this->productSecond = clone $this->product;
         $this->productSecond->setId(null)->setUrlKey('product-second')->save();
         $this->productThird = clone $this->product;