Skip to content

Commit 8d2d8a9

Browse files
danielrenauddanielrenaud
committed
MAGETWO-87660: EndToEndB2CAdminTestCest fails on jenkins
1 parent dc575c2 commit 8d2d8a9

18 files changed

+99
-86
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<element name="title" type="text" selector="aside.confirm .modal-title"/>
1313
<element name="message" type="text" selector="aside.confirm .modal-content"/>
1414
<element name="cancel" type="button" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
15-
<element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="30"/>
15+
<element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="60"/>
1616
</section>
1717
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml

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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../../../../magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminMessagesSection">
12-
<element name="test" type="input" selector=".test"/>
12+
<element name="success" type="text" selector="#messages div.message-success"/>
1313
</section>
1414
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1010
<test name="EndToEndB2CAdminTest">
11-
<after>
12-
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProduct">
13-
<argument name="product" value="BundleProduct"/>
14-
</actionGroup>
15-
</after>
16-
1711
<!--Create Bundle Product-->
1812
<amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
1913
<waitForPageLoad stepKey="waitForProductPageLoadBundle" after="visitAdminProductPageBundle"/>
@@ -40,5 +34,11 @@
4034
<actionGroup ref="viewBundleProductInAdminGrid" stepKey="viewBundleProductInGrid" after="saveBundleProduct">
4135
<argument name="product" value="BundleProduct"/>
4236
</actionGroup>
37+
38+
<!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
39+
<comment userInput="Clean up bundle product" stepKey="cleanUpBundleProduct" after="deleteSimpleProduct"/>
40+
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProduct" after="cleanUpBundleProduct">
41+
<argument name="product" value="BundleProduct"/>
42+
</actionGroup>
4343
</test>
4444
</tests>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<arguments>
1414
<argument name="categoryEntity" defaultValue="_defaultCategory"/>
1515
</arguments>
16-
1716
<seeInCurrentUrl url="{{AdminCategoryPage}}" stepKey="seeOnCategoryPage"/>
1817
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
1918
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/>
@@ -31,7 +30,6 @@
3130
<arguments>
3231
<argument name="categoryEntity" defaultValue="_defaultCategory"/>
3332
</arguments>
34-
3533
<amOnPage url="/{{categoryEntity.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
3634
<waitForPageLoad stepKey="waitForPageLoad1"/>
3735
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{categoryEntity.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
@@ -44,13 +42,13 @@
4442
<argument name="categoryEntity" defaultValue="_defaultCategory"/>
4543
</arguments>
4644
<amOnPage url="{{AdminCategoryPage}}" stepKey="goToCategoryPage"/>
47-
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
45+
<waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
4846
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="clickCategoryLink"/>
4947
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
5048
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
5149
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
5250
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
53-
<waitForPageLoad stepKey="waitForDeleteToFinish"/>
51+
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
5452
<see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
5553
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
5654
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
@@ -71,7 +69,7 @@
7169
<argument name="Category"/>
7270
</arguments>
7371
<amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
74-
<waitForPageLoad stepKey="waitForPageLoad2"/>
72+
<waitForPageLoad stepKey="waitForPageLoad1"/>
7573
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(Category.Name)}}" stepKey="navigateToCreatedCategory" />
7674
<waitForPageLoad stepKey="waitForPageLoad2"/>
7775
<waitForLoadingMaskToDisappear stepKey="waitForSpinner" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@
5757
<argument name="image" defaultValue="ImageUpload"/>
5858
</arguments>
5959
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
60+
<waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
61+
<waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
6062
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
61-
<waitForAjaxLoad stepKey="waitForAjaxUpload"/>
63+
<waitForAjaxLoad time="30" stepKey="waitForAjaxUpload"/>
6264
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
6365
</actionGroup>
6466
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</arguments>
108108
<!--TODO use other action group for filtering grid when MQE-539 is implemented -->
109109
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
110-
<waitForPageLoad stepKey="waitForPageLoadInitial"/>
110+
<waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
111111
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
112112
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
113113
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
@@ -117,7 +117,7 @@
117117
<click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
118118
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
119119
<click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
120-
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForConfirmModal"/>
120+
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
121121
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
122122
</actionGroup>
123123

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
1313
<element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
1414
<element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
15-
<element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="30"/>
15+
<element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
1616
</section>
1717
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,24 @@
1010
<test name="EndToEndB2CAdminTest">
1111
<annotations>
1212
<features value="End to End scenarios"/>
13-
<stories value="B2C - Admin"/>
13+
<stories value="B2C admin - MAGETWO-75412"/>
1414
<group value="e2e"/>
1515
<title value="Pass End to End B2C Admin scenario"/>
1616
<description value="Admin creates products, creates and manages categories, creates promotions, creates an order, processes an order, processes a return, uses admin grids"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-87014"/>
1919
</annotations>
2020
<after>
21-
<!--Clean up categories-->
22-
<actionGroup ref="DeleteCategory" stepKey="cleanSimpleSubCategory">
23-
<argument name="categoryEntity" value="SimpleSubCategory"/>
24-
</actionGroup>
25-
26-
<!--Clean up products-->
27-
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
28-
<argument name="product" value="SimpleProduct"/>
29-
</actionGroup>
30-
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
31-
<argument name="product" value="VirtualProduct"/>
32-
</actionGroup>
21+
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
3322
</after>
23+
3424
<!--Login to Admin Area-->
3525
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
3626

3727
<!--Admin creates product-->
3828
<!--Create Simple Product-->
3929
<amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageSimple"/>
40-
<waitForPageLoad stepKey="waitForProductPageLoadSimple"/>
30+
<waitForPageLoad time="30" stepKey="waitForProductPageLoadSimple"/>
4131
<actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
4232
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
4333
<argument name="product" value="SimpleProduct"/>
@@ -62,7 +52,7 @@
6252

6353
<!--Create Virtual Product-->
6454
<amOnPage url="{{AdminProductIndexPage}}" stepKey="visitAdminProductPageVirtual"/>
65-
<waitForPageLoad stepKey="waitForProductPageLoadVirtual"/>
55+
<waitForPageLoad time="30" stepKey="waitForProductPageLoadVirtual"/>
6656
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateVirtualProduct">
6757
<argument name="product" value="VirtualProduct"/>
6858
</actionGroup>
@@ -186,7 +176,7 @@
186176
<!--Admin creates category-->
187177
<comment userInput="Admin creates category." stepKey="adminCreatesCategoryComment" before="navigateToCategoryPage"/>
188178
<amOnPage url="{{AdminCategoryPage}}" stepKey="navigateToCategoryPage"/>
189-
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
179+
<waitForPageLoad time="30" stepKey="waitForCategoryPageLoad"/>
190180
<!--Create category under Default Category-->
191181
<click selector="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}" stepKey="clickDefaultCategory"/>
192182
<actionGroup ref="CheckCategoryNameIsRequiredField" stepKey="checkCategoryNameIsRequired"/>
@@ -202,24 +192,41 @@
202192
<!--Admin moves category-->
203193
<comment userInput="Admin moves category." stepKey="adminMovesCategoryComment" before="onCategoryPageToMoveCategory"/>
204194
<amOnPage url="{{AdminCategoryPage}}" stepKey="onCategoryPageToMoveCategory"/>
205-
<waitForPageLoad stepKey="waitForPageLoadMoveCategory"/>
195+
<waitForPageLoad time="30" stepKey="waitForPageLoadMoveCategory"/>
206196
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandTree"/>
207197
<dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}"
208198
selector2="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}"
209199
stepKey="dragAndDropCategory"/>
210-
<waitForPageLoad stepKey="waitForMoveConfirmation"/>
200+
<waitForPageLoad time="30" stepKey="waitForMoveConfirmation"/>
211201
<see selector="{{AdminCategoryModalSection.title}}" userInput="Warning Message" stepKey="seeMoveConfirmationModal"/>
212202
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkConfirmMove"/>
213-
<waitForPageLoad stepKey="waitForMove"/>
203+
<waitForPageLoad time="30" stepKey="waitForMove"/>
214204
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeCategoryMoveSuccessMessage"/>
215205
<seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleSubCategory.name)}}" stepKey="seeSubcategoryIsUnderDefault"/>
216206

217207
<!--Admin deletes category-->
218208
<comment userInput="Admin deletes category" stepKey="deleteCategoryComment"/>
219209
<amOnPage url="{{AdminCategoryPage}}" stepKey="onCategoryPageToDeleteCategory"/>
220-
<waitForPageLoad stepKey="waitForCategoryPageDelete"/>
210+
<waitForPageLoad time="30" stepKey="waitForCategoryPageDelete"/>
221211
<actionGroup ref="DeleteCategory" stepKey="deleteCategory">
222212
<argument name="categoryEntity" value="_defaultCategory"/>
223213
</actionGroup>
214+
215+
216+
<!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
217+
<!--Clean up categories-->
218+
<comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
219+
<actionGroup ref="DeleteCategory" stepKey="cleanSimpleSubCategory">
220+
<argument name="categoryEntity" value="SimpleSubCategory"/>
221+
</actionGroup>
222+
<!--Clean up products-->
223+
<comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
224+
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProduct">
225+
<argument name="product" value="SimpleProduct"/>
226+
</actionGroup>
227+
<comment userInput="Clean up virtual product" stepKey="cleanUpVirtualProduct"/>
228+
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
229+
<argument name="product" value="VirtualProduct"/>
230+
</actionGroup>
224231
</test>
225232
</tests>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<element name="saveAttribute" type="button" selector="#save"/>
1414
<element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
1515
<element name="defaultLabel" type="input" selector="input[name='frontend_label[0]']"/>
16-
<element name="inputType" type="select" selector="select[name='frontend_input']" timeout="10"/>
16+
<element name="inputType" type="select" selector="select[name='frontend_input']" timeout="30"/>
1717
<element name="addOption" type="button" selector="#add_new_option_button"/>
1818
<element name="isDefault" type="radio" selector="[data-role='options-container'] tr:nth-of-type({{row}}) input[name='default[]']" parameterized="true"/>
1919
<element name="optionAdminValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][0]']" parameterized="true"/>

0 commit comments

Comments
 (0)