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

Commit 66a2bc8

Browse files
author
Joan He
committed
MAGETWO-80272: Break B2C Guest user test into parts by modules and Magento editions
1 parent 95f32ef commit 66a2bc8

File tree

8 files changed

+94
-41
lines changed

8 files changed

+94
-41
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212
<entity name="CONST" type="CONST">
1313
<data key="one">1</data>
1414
<data key="two">2</data>
15-
<data key="apiSimpleProduct">Api Simple Product</data>
16-
<data key="nonexistentProductName">NonexistentProductName</data>
1715
</entity>
1816
</entities>

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,23 @@
6464
<see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>
6565

6666
<!-- Open Category -->
67+
<comment userInput="Open category" stepKey="commentOpenCategory" />
6768
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>
6869
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">
6970
<argument name="category" value="$$createCategory$$"/>
7071
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
7172
<argument name="productCount" value="CONST.three"/>
7273
</actionGroup>
73-
<!-- Check simple product1 in category -->
74+
<!-- Check simple product 1 in category -->
75+
<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />
7476
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
7577
<argument name="product" value="$$createSimpleProduct1$$"/>
7678
</actionGroup>
7779
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
7880
<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc"/>
7981
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault"/>
80-
<!-- Check simple product2 in category -->
82+
<!-- Check simple product 2 in category -->
83+
<comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" />
8184
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">
8285
<argument name="product" value="$$createSimpleProduct2$$"/>
8386
</actionGroup>
@@ -86,6 +89,7 @@
8689
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault"/>
8790

8891
<!-- View Simple Product 1 -->
92+
<comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" />
8993
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="browseAssertSimpleProduct2ImageNotDefault"/>
9094
<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">
9195
<argument name="product" value="$$createSimpleProduct1$$"/>
@@ -95,6 +99,7 @@
9599
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault"/>
96100

97101
<!-- View Simple Product 2 -->
102+
<comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" />
98103
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1"/>
99104
<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View"/>
100105
<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">
@@ -108,6 +113,7 @@
108113
<!-- Step 4: User compares products -->
109114
<comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>
110115
<!-- Add Simple Product 1 to comparison -->
116+
<comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" />
111117
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" />
112118
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">
113119
<argument name="category" value="$$createCategory$$"/>
@@ -132,6 +138,7 @@
132138
</actionGroup>
133139

134140
<!-- Add Simple Product 2 to comparison -->
141+
<comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" />
135142
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1"/>
136143
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">
137144
<argument name="category" value="$$createCategory$$"/>
@@ -149,25 +156,29 @@
149156
</actionGroup>
150157

151158
<!-- Check products in comparison sidebar -->
152-
<!-- Check simple product1 in comparison sidebar -->
153-
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="compareAddSimpleProduct2ToCompare">
159+
<!-- Check simple product 1 in comparison sidebar -->
160+
<comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>
161+
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">
154162
<argument name="productVar" value="$$createSimpleProduct1$$"/>
155163
</actionGroup>
156-
<!-- Check simple product2 in comparison sidebar -->
164+
<!-- Check simple product 2 in comparison sidebar -->
165+
<comment userInput="Check simple product 2 in comparison sidebar" stepKey="commentCheckSimpleProduct2InComparisonSidebar" />
157166
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar">
158167
<argument name="productVar" value="$$createSimpleProduct2$$"/>
159168
</actionGroup>
160169

161170
<!-- Check products on comparison page -->
162-
<!-- Check simple product1 on comparison page -->
163-
<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="compareSimpleProduct2InSidebar"/>
171+
<!-- Check simple product 1 on comparison page -->
172+
<comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>
173+
<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>
164174
<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison">
165175
<argument name="productVar" value="$$createSimpleProduct1$$"/>
166176
</actionGroup>
167177
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
168178
<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison"/>
169179
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison"/>
170180
<!-- Check simple product2 on comparison page -->
181+
<comment userInput="Check simple product 2 on comparison page" stepKey="commentCheckSimpleProduct2OnComparisonPage" />
171182
<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison">
172183
<argument name="productVar" value="$$createSimpleProduct2$$"/>
173184
</actionGroup>
@@ -176,6 +187,7 @@
176187
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
177188

178189
<!-- Clear comparison sidebar -->
190+
<comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" />
179191
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>
180192
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">
181193
<argument name="category" value="$$createCategory$$"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
12+
<entity name="CONST" type="CONST">
13+
<data key="apiSimpleProduct">Api Simple Product</data>
14+
<data key="nonexistentProductName">NonexistentProductName</data>
15+
</entity>
16+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.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)