Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit ebd1eb5

Browse files
author
Joan He
committed
MAGETWO-87840: Break B2C logged in user test into parts by modules and Magento editions
1 parent 2afee6a commit ebd1eb5

File tree

7 files changed

+88
-49
lines changed

7 files changed

+88
-49
lines changed

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

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,29 +53,33 @@
5353
<see userInput="Welcome, John Doe!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome" after="homeWaitForWelcomeMessage"/>
5454

5555
<!-- Open Category -->
56-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory" after="homeCheckWelcome"/>
56+
<comment userInput="Open category" stepKey="commentOpenCategory" after="homeCheckWelcome"/>
57+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory" after="commentOpenCategory"/>
5758
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory" after="browseClickCategory">
5859
<argument name="category" value="$$createCategory$$"/>
5960
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
6061
<argument name="productCount" value="CONST.three"/>
6162
</actionGroup>
62-
<!-- Check simple product1 in category -->
63-
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1" after="browseAssertCategory">
63+
<!-- Check simple product 1 in category -->
64+
<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" after="browseAssertCategory"/>
65+
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1" after="commentCheckSimpleProductInCategory">
6466
<argument name="product" value="$$createSimpleProduct1$$"/>
6567
</actionGroup>
6668
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
6769
<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc" after="browseAssertCategoryProduct1"/>
6870
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault" after="browseGrabSimpleProduct1ImageSrc"/>
69-
<!-- Check simple product2 in category -->
70-
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2" after="browseAssertSimpleProduct1ImageNotDefault">
71+
<!-- Check simple product 2 in category -->
72+
<comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" after="browseAssertSimpleProduct1ImageNotDefault"/>
73+
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2" after="commentCheckSimpleProduct2InCategory">
7174
<argument name="product" value="$$createSimpleProduct2$$"/>
7275
</actionGroup>
7376
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
7477
<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc" after="browseAssertCategoryProduct2"/>
7578
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault" after="browseGrabSimpleProduct2ImageSrc"/>
7679

7780
<!-- View Simple Product 1 -->
78-
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="browseAssertSimpleProduct2ImageNotDefault"/>
81+
<comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>
82+
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>
7983
<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page" after="browseClickCategorySimpleProduct1View">
8084
<argument name="product" value="$$createSimpleProduct1$$"/>
8185
</actionGroup>
@@ -84,7 +88,8 @@
8488
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault" after="browseGrabSimpleProduct1PageImageSrc"/>
8589

8690
<!-- View Simple Product 2 -->
87-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1" after="browseAssertSimpleProduct1PageImageNotDefault"/>
91+
<comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" after="browseAssertSimpleProduct1PageImageNotDefault"/>
92+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1" after="commentViewSimpleProduct2"/>
8893
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View" after="clickCategory1"/>
8994
<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page" after="browseClickCategorySimpleProduct2View">
9095
<argument name="product" value="$$createSimpleProduct2$$"/>
@@ -97,7 +102,8 @@
97102
<!-- Step 4: User compares products -->
98103
<comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
99104
<!-- Add Simple Product 1 to comparison -->
100-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" after="startOfComparingProducts"/>
105+
<comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" after="startOfComparingProducts"/>
106+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" after="commentAddSimpleProduct1ToComparison"/>
101107
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory" after="compareClickCategory">
102108
<argument name="category" value="$$createCategory$$"/>
103109
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
@@ -121,7 +127,8 @@
121127
</actionGroup>
122128

123129
<!-- Add Simple Product 2 to comparison -->
124-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1" after="compareAddSimpleProduct1ToCompare"/>
130+
<comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" after="compareAddSimpleProduct1ToCompare"/>
131+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1" after="commentAddSimpleProduct2ToComparison"/>
125132
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1" after="compareClickCategory1">
126133
<argument name="category" value="$$createCategory$$"/>
127134
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
@@ -138,8 +145,9 @@
138145
</actionGroup>
139146

140147
<!-- Check products in comparison sidebar -->
141-
<!-- Check simple product1 in comparison sidebar -->
142-
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="compareAddSimpleProduct2ToCompare">
148+
<!-- Check simple product 1 in comparison sidebar -->
149+
<comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
150+
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
143151
<argument name="productVar" value="$$createSimpleProduct1$$"/>
144152
</actionGroup>
145153
<!-- Check simple product2 in comparison sidebar -->
@@ -148,8 +156,9 @@
148156
</actionGroup>
149157

150158
<!-- Check products on comparison page -->
151-
<!-- Check simple product1 on comparison page -->
152-
<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="compareSimpleProduct2InSidebar"/>
159+
<!-- Check simple product 1 on comparison page -->
160+
<comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
161+
<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
153162
<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison" after="compareOpenComparePage">
154163
<argument name="productVar" value="$$createSimpleProduct1$$"/>
155164
</actionGroup>
@@ -165,7 +174,8 @@
165174
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison" after="compareGrabSimpleProduct2ImageSrcInComparison"/>
166175

167176
<!-- Clear comparison sidebar -->
168-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
177+
<comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
178+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
169179
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2" after="compareClickCategoryBeforeClear">
170180
<argument name="category" value="$$createCategory$$"/>
171181
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<!-- Step 2: User searches for product -->
1313
<comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
1414
<!-- Advanced Search with Product 1 Data -->
15-
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="startOfSearchingProducts"/>
15+
<comment userInput="Advanced search" stepKey="commentAdvancedSearch" after="startOfSearchingProducts"/>
16+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="searchOpenAdvancedSearchForm" after="commentAdvancedSearch"/>
1617
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
1718
<fillField userInput="$$createSimpleProduct1.name$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" stepKey="searchAdvancedFillProductName" after="searchOpenAdvancedSearchForm"/>
1819
<fillField userInput="$$createSimpleProduct1.sku$$" selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" stepKey="searchAdvancedFillSKU" after="searchAdvancedFillProductName"/>
@@ -36,7 +37,8 @@
3637
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchAdvancedGrabSimpleProduct1PageImageSrc" stepKey="searchAdvancedAssertSimpleProduct1PageImageNotDefault" after="searchAdvancedGrabSimpleProduct1PageImageSrc"/>
3738

3839
<!-- Quick Search with common part of product names -->
39-
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault">
40+
<comment userInput="Quick search" stepKey="commentQuickSearch" after="searchAdvancedAssertSimpleProduct1PageImageNotDefault"/>
41+
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchQuickSearchCommonPart" after="commentQuickSearch">
4042
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
4143
<argument name="phrase" value="CONST.apiSimpleProduct"/>
4244
</actionGroup>
@@ -45,8 +47,9 @@
4547
</actionGroup>
4648
<see userInput="3" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="searchAssertFilterCategoryProductCountCommonPart" after="searchSelectFilterCategoryCommonPart"/>
4749

48-
<!-- Search simple product1 -->
49-
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart">
50+
<!-- Search simple product 1 -->
51+
<comment userInput="Search simple product 1" stepKey="commentSearchSimpleProduct1" after="searchAssertFilterCategoryProductCountCommonPart"/>
52+
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="searchAssertFilterCategorySimpleProduct1" after="commentSearchSimpleProduct1">
5053
<argument name="product" value="$$createSimpleProduct1$$"/>
5154
</actionGroup>
5255
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
@@ -61,7 +64,8 @@
6164
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
6265

6366
<!-- Quick Search with non-existent product name -->
64-
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="searchAssertSimpleProduct2ImageNotDefault">
67+
<comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNon-existentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
68+
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNon-existentProductName">
6569
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
6670
<argument name="phrase" value="CONST.nonexistentProductName"/>
6771
</actionGroup>

0 commit comments

Comments
 (0)