diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
index fb1cb5d63a3a551430bcbdf0bc1f6b8d1046c4a2..6af0253e217e3f51e47e9a5b4021869037bb00c2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
@@ -9,7 +9,6 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Mtf\Client\Locator;
-use Magento\Mtf\Factory\Factory;
use Magento\Mtf\Fixture\FixtureInterface;
/**
@@ -32,16 +31,11 @@ class CategoryForm extends FormTabs
protected $dropdownBlock = '.dropdown';
/**
- * Get Category edit form.
+ * Selector for confirm.
*
- * @return \Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid
+ * @var string
*/
- public function getCategoryProductsGrid()
- {
- return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryTabProductGrid(
- $this->_rootElement->find($this->productsGridBlock)
- );
- }
+ protected $confirmModal = '.confirm._show[data-role=modal]';
/**
* Fill form with tabs.
@@ -57,8 +51,10 @@ class CategoryForm extends FormTabs
$store = $fixture->getStoreId();
$storeSwitcherBlock = $this->browser->find($this->storeSwitcherBlock);
$storeSwitcherBlock->find($this->dropdownBlock, Locator::SELECTOR_CSS, 'liselectstore')->setValue($store);
- $this->browser->acceptAlert();
-
+ $element = $this->browser->find($this->confirmModal);
+ /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
+ $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]);
+ $modal->acceptAlert();
}
return $this->fillTabs($tabs, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
index 6be4a2275e35365d10655a382d0fdb93b265f618..8a2df347d213ab64af57163d6f9a4bf0c4bec3b0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -42,6 +42,7 @@
<field name="name" xsi:type="string">Product \'!@#$%^&*()+:;\\|}{][?=-~` %isolation%</field>
<field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
<field name="is_virtual" xsi:type="string">No</field>
+ <field name="product_has_weight" xsi:type="string">Yes</field>
<field name="weight" xsi:type="string">1</field>
<field name="quantity_and_stock_status" xsi:type="array">
<item name="qty" xsi:type="string">25</item>
@@ -73,6 +74,7 @@
<item name="qty" xsi:type="string">25</item>
<item name="is_in_stock" xsi:type="string">In Stock</item>
</field>
+ <field name="product_has_weight" xsi:type="string">Yes</field>
<field name="weight" xsi:type="string">1</field>
<field name="price" xsi:type="array">
<item name="value" xsi:type="string">560</item>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
index 6baff36cc94ebc9f8a23103474da4070105190b5..4ce59a74583bfef397c8756bb0b1bc4bbe0797cd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
@@ -29,7 +29,7 @@ class AssertCreditMemoButton extends AbstractConstraint
$orderIndex->open();
$orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
\PHPUnit_Framework_Assert::assertTrue(
- $salesOrderView->getPageActions()->isActionButtonVisible('CreditMemo'),
+ $salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
'Credit memo button is absent on order view page.'
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
index ed8806f44c61642cfd56bdf2fd9644d5ac2c8b7b..d9e935600ba18bea3a6040b9977d214ee112a9b3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
@@ -29,7 +29,7 @@ class AssertNoCreditMemoButton extends AbstractConstraint
$orderIndex->open();
$orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
\PHPUnit_Framework_Assert::assertFalse(
- $salesOrderView->getPageActions()->isActionButtonVisible('CreditMemo'),
+ $salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
'Credit memo button is present on order view page.'
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
index c7fa945182bb33511e0e54380bddec10d9f28ede..d739d5bae2626b28189928338119d49e0c37972b 100644
--- a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml
@@ -33,6 +33,7 @@
<data name="cart/data/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
index eedc095972566f67e2200c89402dc27a96dccacc..cf2ad50688a9e7c1535cb5cdffb191fa1b8154b6 100644
--- a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
@@ -33,6 +33,7 @@
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail International</data>
<data name="payment/method" xsi:type="string">checkmo</data>
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
+ <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>