Skip to content

Commit 84e9a72

Browse files
committed
Merge remote-tracking branches 'east/MAGETWO-66345', 'east/MAGETWO-61227' and 'east/MAGETWO-61222' into pr-2.0.16
3 parents e2dd00a + 6d69499 + 3c1d220 commit 84e9a72

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,8 @@
401401
<data name="product/data/name" xsi:type="string">simple%isolation%</data>
402402
<data name="product/data/sku" xsi:type="string">simple%isolation%</data>
403403
<data name="product/data/price/value" xsi:type="string">10</data>
404+
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">1000</data>
405+
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
404406
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
405407
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
406408
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />

dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ public function getAllTaxRates()
338338
*/
339339
public function isTaxRateAvailable($value)
340340
{
341+
$this->waitForTaxRates();
341342
/** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRate */
342343
$taxRate = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
343344
return $taxRate->isValueVisible($value);

0 commit comments

Comments
 (0)