Skip to content

Commit 1416c4c

Browse files
authored
Merge pull request #3159 from magento-pangolin/2.2-dev-pan-2.3.0
[pangolin] MFTF 2.3.0 version update for CE 2.2
2 parents 11f66c4 + ec18622 commit 1416c4c

File tree

172 files changed

+2765
-5447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2765
-5447
lines changed

app/code/Magento/AdminNotification/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/code/Magento/Analytics/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/Authorization/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Authorizenet/Test/Mftf/composer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/code/Magento/Backend/Test/Mftf/composer.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/code/Magento/Backup/Test/Mftf/composer.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/code/Magento/Braintree/Test/Mftf/composer.json

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="ApiBundleLink" type="bundle_link">
12-
<var key="sku" entityKey="sku" entityType="product2"/>
1312
<var key="option_id" entityKey="return" entityType="bundle_option"/>
1413
<var key="sku" entityKey="sku" entityType="product"/>
1514
<data key="qty">1</data>

app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<data key="urlKey" unique="suffix">bundleproduct</data>
2121
<data key="visibility">4</data>
2222
<data key="option_title" unique="suffix">TestOption</data>
23-
<data key="input_type" >Drop-down</data>
2423
<data key="default_quantity1" >10</data>
2524
<data key="default_quantity2" >20</data>
2625
<data key="input_type" >Drop-down</data>

app/code/Magento/Bundle/Test/Mftf/composer.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

app/code/Magento/BundleImportExport/Test/Mftf/composer.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

app/code/Magento/CacheInvalidate/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Captcha/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
<argument name="productName"/>
2323
</arguments>
2424
<click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
25-
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdding"/>
2625
<waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
27-
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdded"/>
2826
<waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
2927
<waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
3028
<waitForPageLoad stepKey="waitForPageLoad"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</section>
4444
<section name="ProductWYSIWYGSection">
4545
<element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
46-
<element name="v4" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" />
46+
<element name="v436" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" />
4747
<element name="v3" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']" />
4848
<element name="TinymceDescription3" type ="button" selector="//span[text()='Description']" />
4949
<element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<element name="multicheckDropdown" type="button" selector="div[data-role='grid-wrapper'] th.data-grid-multicheck-cell button.action-multicheck-toggle"/>
1818
<element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
1919
<element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
20-
<element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
2120
<element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
2221
<element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
2322
<element name="productNameInNameColumn" type="input" selector="//td[4]/div[@class='data-grid-cell-content']"/>

app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<test name="SaveProductWithCustomOptionsAdditionalWebsiteTest">
1212
<annotations>
1313
<features value="Save a product with Custom Options and assign to a different website"/>
@@ -86,6 +86,7 @@
8686
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
8787

8888
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
89+
<scrollTo stepKey="scrollToCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" />
8990
<seeNumberOfElements selector=".admin__dynamic-rows[data-index='values'] tr.data-row" userInput="3" stepKey="see4RowsOfOptions"/>
9091
</test>
9192
</tests>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
5252
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
5353
<waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
54+
<waitForPageLoad stepKey="waitForCartToLoad"/>
5455
<see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
5556
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
5657
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>

0 commit comments

Comments
 (0)