Merge pull request #601 from magento-okapis/MAGETWO-59449-Stock-Decrement-No-Upgrade

Oleksii Korshenko · web-flow · commit 549852f8ee0d · 2016-11-16T14:36:25.000-06:00
[Okapis] MAGETWO-59449: Stock decrements in multi-website doesn't work - 2.0.11
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -148,7 +148,7 @@ public function __construct(
      */
     public function getDefaultScopeId()
     {
-        return (int) $this->storeManager->getWebsite()->getId();
+        return 1;
     }
 
     /**
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
@@ -59,18 +59,9 @@ protected function setUp()
         );
     }
 
-    public function testGetDefaultWebsiteId()
+    public function testGetDefaultScopeId()
     {
         $id = 1;
-        $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $websiteMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($id);
-        $this->storeManagerMock->expects($this->once())
-            ->method('getWebsite')
-            ->willReturn($websiteMock);
         $this->assertEquals($id, $this->model->getDefaultScopeId());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function __construct(`
`148`	`148`	`*/`
`149`	`149`	`public function getDefaultScopeId()`
`150`	`150`	`{`
`151`		`- return (int) $this->storeManager->getWebsite()->getId();`
	`151`	`+ return 1;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -59,18 +59,9 @@ protected function setUp()`
`59`	`59`	`);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function testGetDefaultWebsiteId()`
	`62`	`+ public function testGetDefaultScopeId()`
`63`	`63`	`{`
`64`	`64`	`$id = 1;`
`65`		`- $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')`
`66`		`- ->disableOriginalConstructor()`
`67`		`- ->getMock();`
`68`		`- $websiteMock->expects($this->once())`
`69`		`- ->method('getId')`
`70`		`- ->willReturn($id);`
`71`		`- $this->storeManagerMock->expects($this->once())`
`72`		`- ->method('getWebsite')`
`73`		`- ->willReturn($websiteMock);`
`74`	`65`	`$this->assertEquals($id, $this->model->getDefaultScopeId());`
`75`	`66`	`}`
`76`	`67`