Merge pull request #1321 from magento-east/pr-2.0.16

duhon · web-flow · commit 8ce538f9f54d · 2017-07-12T20:08:21.000+03:00
EAST fixbugs 2.0.16
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -99,7 +99,7 @@ public function getWebsiteId()
      */
     public function getStockId()
     {
-        return $this->getData(self::KEY_WEBSITE_ID);
+        return $this->getData(self::KEY_STOCK_ID);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -401,6 +401,8 @@
             <data name="product/data/name" xsi:type="string">simple%isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">10</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">1000</data>
+            <data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -338,6 +338,7 @@ public function getAllTaxRates()
      */
     public function isTaxRateAvailable($value)
     {
+        $this->waitForTaxRates();
         /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRate */
         $taxRate = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
         return $taxRate->isValueVisible($value);

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function getWebsiteId()`
`99`	`99`	`*/`
`100`	`100`	`public function getStockId()`
`101`	`101`	`{`
`102`		`- return $this->getData(self::KEY_WEBSITE_ID);`
	`102`	`+ return $this->getData(self::KEY_STOCK_ID);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ public function getAllTaxRates()`
`338`	`338`	`*/`
`339`	`339`	`public function isTaxRateAvailable($value)`
`340`	`340`	`{`
	`341`	`+ $this->waitForTaxRates();`
`341`	`342`	`/** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRate */`
`342`	`343`	`$taxRate = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');`
`343`	`344`	`return $taxRate->isValueVisible($value);`