Skip to content

Commit b0cd7a3

Browse files
zakdmazakdma
authored
Merge pull request #5013 from magento-tsg/2.3-develop-pr92
[TSG] TESTs Fixes for 2.3 (pr92) (2.3-develop)
2 parents efd77d3 + 287eb92 commit b0cd7a3

File tree

6 files changed

+26
-11
lines changed

6 files changed

+26
-11
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<argument name="submenuUiId" type="string"/>
1818
</arguments>
1919

20+
<waitForPageLoad stepKey="waitPageLoad"/>
2021
<click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
2122
<click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
2223
</actionGroup>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<after>
2626
<actionGroup ref="logout" stepKey="logout"/>
2727
</after>
28+
<waitForPageLoad stepKey="waitForPageLoad"/>
2829
<click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>
2930
<actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
3031
<argument name="title" value="{{AdminMenuDashboard.pageTitle}}"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<argument name="productAttributeCode" type="string"/>
1717
</arguments>
1818

19-
<waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="waitForAdminProductAttributeGridLoad"/>
19+
<waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" before="seeAttributeCodeInGrid" stepKey="waitForAdminProductAttributeGridLoad"/>
2020
<click selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="clickAttributeToView"/>
2121
<waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad"/>
2222
</actionGroup>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
5252
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
5353
<after>
54+
<actionGroup ref="DeleteCategory" stepKey="DeleteCategory">
55+
<argument name="categoryEntity" value="SimpleSubCategory"/>
56+
</actionGroup>
5457
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
5558
<actionGroup ref="logout" stepKey="logout"/>
5659
</after>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<group value="ConfigurableProduct"/>
2020
</annotations>
2121
<before>
22-
<!-- Login as Admin -->
23-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2422
<!-- Create default category with subcategory -->
2523
<createData entity="ApiCategory" stepKey="createCategory"/>
2624
<createData entity="SubCategoryWithParent" stepKey="createSubcategory">
@@ -70,6 +68,8 @@
7068
<createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption8">
7169
<requiredEntity createDataKey="createConfigProductAttribute2"/>
7270
</createData>
71+
<!-- Login as Admin -->
72+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
7373
<!-- Add created attributes with options to Attribute Set -->
7474
<actionGroup ref="AdminAddUnassignedAttributeToGroup" stepKey="createDefaultAttributeSet">
7575
<argument name="label" value="mySet"/>
@@ -89,33 +89,34 @@
8989
<actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
9090
<argument name="label" value="mySet"/>
9191
</actionGroup>
92+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearAttributeSetsFilter"/>
9293
<!-- Delete First attribute -->
93-
<actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchAttributeByCodeOnProductAttributeGrid">
94-
<argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
95-
</actionGroup>
9694
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
9795
<argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
9896
</actionGroup>
9997
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
10098
<argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
10199
</actionGroup>
102100
<!-- Delete Second attribute -->
103-
<actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchSecondAttributeByCodeOnProductAttributeGrid">
104-
<argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
105-
</actionGroup>
106101
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openSecondProductAttributeFromSearchResultInGrid">
107102
<argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
108103
</actionGroup>
109104
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteSecondProductAttributeByAttributeCode">
110105
<argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
111106
</actionGroup>
107+
<!-- Clear filters -->
108+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductAttributesFilter"/>
109+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilter"/>
112110
<!-- Log out -->
113111
<actionGroup ref="logout" stepKey="logout"/>
114112
</after>
115113
<!-- Create three configurable products with options -->
116114
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
117115
<waitForPageLoad time="30" stepKey="wait1"/>
118116
<!-- Edit created first product as configurable product with options -->
117+
<actionGroup ref="filterProductGridBySku" stepKey="filterGridByFirstProduct">
118+
<argument name="product" value="$$createFirstConfigurableProduct$$"/>
119+
</actionGroup>
119120
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductFirst">
120121
<argument name="product" value="$$createFirstConfigurableProduct$$"/>
121122
</actionGroup>
@@ -135,6 +136,9 @@
135136
<waitForPageLoad stepKey="waitForMessage"/>
136137
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageFirst"/>
137138
<!-- Edit created second product as configurable product with options -->
139+
<actionGroup ref="filterProductGridBySku" stepKey="filterGridBySecondProduct">
140+
<argument name="product" value="$$createSecondConfigurableProduct$$"/>
141+
</actionGroup>
138142
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductSecond">
139143
<argument name="product" value="$$createSecondConfigurableProduct$$"/>
140144
</actionGroup>
@@ -155,6 +159,9 @@
155159
<waitForPageLoad stepKey="waitForSuccessMessage"/>
156160
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageSecond"/>
157161
<!-- Edit created third product as configurable product with options -->
162+
<actionGroup ref="filterProductGridBySku" stepKey="filterGridByThirdProduct">
163+
<argument name="product" value="$$createThirdConfigurableProduct$$"/>
164+
</actionGroup>
158165
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductThird">
159166
<argument name="product" value="$$createThirdConfigurableProduct$$"/>
160167
</actionGroup>
@@ -174,6 +181,9 @@
174181
<waitForPageLoad stepKey="waitForProductPage"/>
175182
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveConfigurableProductMessage"/>
176183
<!-- Create Simple product with options -->
184+
<actionGroup ref="filterProductGridBySku" stepKey="filterGridBySimpleProduct">
185+
<argument name="product" value="$$createSimpleProduct$$"/>
186+
</actionGroup>
177187
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditSimpleProduct">
178188
<argument name="product" value="$$createSimpleProduct$$"/>
179189
</actionGroup>

‎app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<group value="SearchEngineMysql"/>
2121
</annotations>
2222
<before>
23-
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
23+
<magentoCLI command="downloadable:domains:add example.com static.magento.com" before="product" stepKey="addDownloadableDomain"/>
2424
<createData entity="ApiDownloadableProduct" stepKey="product"/>
2525
<createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
2626
<requiredEntity createDataKey="product"/>
@@ -30,7 +30,7 @@
3030
</createData>
3131
</before>
3232
<after>
33-
<magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
33+
<magentoCLI command="downloadable:domains:remove example.com static.magento.com" stepKey="removeDownloadableDomain"/>
3434
</after>
3535
</test>
3636
</tests>

0 commit comments

Comments
 (0)