Skip to content

Commit ac9d4c8

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'pangolin/flaky-fixes-pr' into bug_fixes_beta_bugs
2 parents 5f6a980 + e19cf15 commit ac9d4c8

12 files changed

+36
-31
lines changed

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
20-
<group value="skip"/>
20+
<skip>
21+
<issueId value="MQE-1187"/>
22+
<issueId value="DEVOPS-3512"/>
23+
</skip>
2124
</annotations>
2225

2326
<!--Login to admin area-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
118118
<element name="UploadImage" type="file" selector=".fileupload" />
119119
<element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
120-
<element name="InsertFile" type="text" selector="#insert_files"/>
120+
<element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
121121
<element name="CreateFolder" type="button" selector="#new_folder" />
122122
<element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
123123
<element name="CancelBtn" type="button" selector="#cancel" />

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,25 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-194"/>
1919
<group value="Catalog"/>
20-
<skip>
21-
<issueId value="MAGETWO-92780"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData entity="productDropDownAttribute" stepKey="attribute"/>
26-
2723
<createData entity="productAttributeOption1" stepKey="option1">
2824
<requiredEntity createDataKey="attribute"/>
2925
</createData>
3026
<createData entity="productAttributeOption2" stepKey="option2">
3127
<requiredEntity createDataKey="attribute"/>
3228
</createData>
33-
3429
<createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
3530
<requiredEntity createDataKey="attribute"/>
3631
</createData>
37-
3832
<createData entity="ApiProductWithDescription" stepKey="product"/>
39-
4033
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
4134
</before>
4235
<after>
4336
<deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
4437
<actionGroup ref="logout" stepKey="logout"/>
4538
</after>
46-
4739
<!-- Assert attribute presence in storefront product additional information -->
4840
<amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>
4941
<waitForPageLoad stepKey="wait1"/>
@@ -64,6 +56,8 @@
6456
<see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
6557
<!-- Save attribute set -->
6658
<actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
59+
<!-- Clear cache -->
60+
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
6761
<!-- Go to create new product page -->
6862
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
6963
<waitForPageLoad stepKey="wait2"/>
@@ -72,8 +66,7 @@
7266
<!-- Assert removed attribute not presence in storefront product additional information -->
7367
<amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage2"/>
7468
<waitForPageLoad stepKey="wait3"/>
75-
<actionGroup ref="checkAttributeNotInMoreInformationTab" stepKey="checkAttributeNotInMoreInformationTab">
76-
<argument name="attributeLabel" value="$$attribute.attribute[frontend_labels][0][label]$$"/>
77-
</actionGroup>
69+
<dontSeeElement selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="dontSeeProductAttribute"/>
70+
<dontSee userInput="$$attribute.attribute[frontend_labels][0][label]$$" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="dontSeeAttributeLabel"/>
7871
</test>
7972
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<group value="product"/>
1919
<testCaseId value="MAGETWO-92384"/>
20-
<group value="skip"/>
21-
<skip>
22-
<issueId value="MAGETWO-93261"/>
23-
</skip>
2420
</annotations>
2521
<before>
2622
<createData entity="_defaultCategory" stepKey="createCategory"/>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<description value="Admin should be able to see the full title of the selected custom option value in the order"/>
1818
<severity value="MAJOR"/>
1919
<testCaseId value="MC-3043"/>
20-
<group value="skip"/>
21-
<!-- Skip due to MQE-1128 -->
22-
<skip>
23-
<issueId value="MQE-1128"/>
24-
</skip>
2520
</annotations>
2621
<before>
2722
<!--Create Simple Product with Custom Options-->
@@ -106,6 +101,6 @@
106101
</assertEquals>
107102
<moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
108103
<waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
109-
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
104+
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
110105
</test>
111106
</tests>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminInvoicesFiltersSection">
1212
<element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
13+
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
1314
</section>
1415
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@
7878
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
7979
<amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
8080
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
81+
<actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridInitial"/>
8182
<click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilters"/>
8283
<fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
84+
<click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
8385
<click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
8486
<see selector="{{AdminInvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
8587
</test>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616

1717
<!-- change the default state to California -->
1818
<scrollTo selector="#tax_defaults-head" x="0" y="-80" stepKey="scrollToTaxDefaults" />
19+
<!-- conditionalClick twice to fix some flaky behavior -->
1920
<conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
21+
<conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" />
2022
<uncheckOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
2123
<selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
2224
<fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput="*"/>
2325

2426
<!-- change the options for shopping cart display to show tax -->
2527
<scrollTo selector="#tax_cart_display-head" x="0" y="-80" stepKey="scrollToTaxShoppingCartDisplay" />
28+
<!-- conditionalClick twice to fix some flaky behavior -->
2629
<conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
30+
<conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="#tax_cart_display" visible="false"/>
2731
<uncheckOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
2832
<selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
2933
<uncheckOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
@@ -33,7 +37,9 @@
3337

3438
<!-- change the options for orders, invoices, credit memos display to show tax -->
3539
<scrollTo selector="#tax_sales_display-head" x="0" y="-80" stepKey="scrollToTaxSalesDisplay" />
40+
<!-- conditionalClick twice to fix some flaky behavior -->
3641
<conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
42+
<conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="#tax_sales_display" visible="false"/>
3743
<uncheckOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
3844
<selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
3945
<uncheckOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>
@@ -54,13 +60,17 @@
5460
<waitForPageLoad stepKey="waitForTaxConfigLoad"/>
5561

5662
<!-- change the default state to none -->
63+
<!-- conditionalClick twice to fix some flaky behavior -->
5764
<conditionalClick stepKey="clickCalculationSettings" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
65+
<conditionalClick stepKey="clickCalculationSettingsAgain" selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="{{AdminConfigureTaxSection.systemValueDefaultState}}" visible="false" />
5866
<checkOption stepKey="clickDefaultState" selector="{{AdminConfigureTaxSection.systemValueDefaultState}}"/>
5967
<selectOption stepKey="selectDefaultState" selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="California"/>
6068
<fillField stepKey="fillDefaultPostCode" selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput=""/>
6169

6270
<!-- change the options for shopping cart display to not show tax -->
71+
<!-- conditionalClick twice to fix some flaky behavior -->
6372
<conditionalClick stepKey="clickShoppingCartDisplaySettings" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
73+
<conditionalClick stepKey="clickShoppingCartDisplaySettingsAgain" selector="{{AdminConfigureTaxSection.shoppingCartDisplay}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}" visible="false"/>
6474
<checkOption stepKey="clickTaxTotalCart" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalCart}}"/>
6575
<selectOption stepKey="selectTaxTotalCart" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalCart}}" userInput="Yes"/>
6676
<checkOption stepKey="clickDisplayTaxSummaryCart" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummaryCart}}"/>
@@ -69,7 +79,9 @@
6979
<selectOption stepKey="selectDisplayZeroTaxCart" selector="{{AdminConfigureTaxSection.dropdownDisplayZeroTaxCart}}" userInput="Yes"/>
7080

7181
<!-- change the options for orders, invoices, credit memos display to not show tax -->
82+
<!-- conditionalClick twice to fix some flaky behavior -->
7283
<conditionalClick stepKey="clickOrdersInvoicesCreditSales" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
84+
<conditionalClick stepKey="clickOrdersInvoicesCreditSalesAgain" selector="{{AdminConfigureTaxSection.ordersInvoicesCreditSales}}" dependentSelector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}" visible="false"/>
7385
<checkOption stepKey="clickTaxTotalSales" selector="{{AdminConfigureTaxSection.systemValueIncludeTaxTotalSales}}"/>
7486
<selectOption stepKey="selectTaxTotalSales" selector="{{AdminConfigureTaxSection.dropdownIncludeTaxTotalSales}}" userInput="Yes"/>
7587
<checkOption stepKey="clickDisplayTaxSummarySales" selector="{{AdminConfigureTaxSection.systemValueDisplayTaxSummarySales}}"/>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
<description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-41930"/>
19-
<!--Skip because of issue MAGETWO-90966 on 4 step-->
20-
<group value="skip"/>
2119
<group value="checkout"/>
2220
<group value="tax"/>
21+
<skip>
22+
<issueId value="MAGETWO-90966"/>
23+
</skip>
2324
</annotations>
2425
<before>
2526
<!-- Preconditions -->

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestVirtualQuoteTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
<description value="Tax information are updating/recalculating on fly in shopping cart for Guest (virtual quote)"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-41931"/>
19-
<!--Skip because of issue MAGETWO-90966 on 4 step-->
20-
<group value="skip"/>
2119
<group value="checkout"/>
2220
<group value="tax"/>
21+
<skip>
22+
<issueId value="MAGETWO-90966"/>
23+
</skip>
2324
</annotations>
2425
<before>
2526
<!-- Preconditions -->

0 commit comments

Comments
 (0)