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

Commit 8b0eba1

Browse files
author
Joan He
committed
MAGETWO-80272: Break B2C Guest user test into parts by modules and Magento editions
1 parent 6e60f7b commit 8b0eba1

File tree

2 files changed

+48
-44
lines changed

2 files changed

+48
-44
lines changed

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

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
</actionGroup>
5858

5959
<!-- Check products in minicart -->
60+
<!-- Check simple product1 in minicart -->
6061
<actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct1" after="cartAddProduct2ToCart">
6162
<argument name="product" value="$$createSimpleProduct1$$"/>
6263
</actionGroup>
@@ -73,6 +74,7 @@
7374
<actionGroup ref="StorefrontOpenMinicartAndCheckSimpleProductActionGroup" stepKey="cartOpenMinicartAndCheckSimpleProduct2" after="cartMinicartAssertSimpleProduct1PageImageNotDefault">
7475
<argument name="product" value="$$createSimpleProduct2$$"/>
7576
</actionGroup>
77+
<!-- Check simple product2 in minicart -->
7678
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
7779
<grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2ImageSrc" after="cartOpenMinicartAndCheckSimpleProduct2"/>
7880
<assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabSimpleProduct2ImageSrc" stepKey="cartMinicartAssertSimpleProduct2ImageNotDefault" after="cartMinicartGrabSimpleProduct2ImageSrc"/>
@@ -84,27 +86,8 @@
8486
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabSimpleProduct2PageImageSrc" after="cartAssertMinicartProduct2Page"/>
8587
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabSimpleProduct2PageImageSrc" stepKey="cartMinicartAssertSimpleProduct2PageImageNotDefault" after="cartMinicartGrabSimpleProduct2PageImageSrc"/>
8688

87-
<!-- @TODO: MAGETWO-80272 Move to Configurable -->
88-
<actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="cartMinicartAssertSimpleProduct2PageImageNotDefault">
89-
<argument name="product" value="$$createConfigProduct$$"/>
90-
<argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
91-
</actionGroup>
92-
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
93-
<grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
94-
<assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
95-
<click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
96-
<see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
97-
<click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
98-
<actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="cartMinicartClickConfigProduct">
99-
<argument name="product" value="$$createConfigProduct$$"/>
100-
<argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
101-
</actionGroup>
102-
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
103-
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
104-
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
105-
10689
<!-- Check products in cart -->
107-
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="cartMinicartAssertConfigProductPageImageNotDefault"/>
90+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="cartMinicartAssertSimpleProduct2PageImageNotDefault"/>
10891
<actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
10992
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
11093
<argument name="subtotal" value="E2EB2CQuote.subtotal"/>
@@ -116,6 +99,7 @@
11699
<argument name="total" value="E2EB2CQuote.total"/>
117100
</actionGroup>
118101

102+
<!-- Check simple product1 in cart -->
119103
<actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct1" after="cartAssertCart">
120104
<argument name="product" value="$$createSimpleProduct1$$"/>
121105
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
@@ -132,6 +116,7 @@
132116
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc1" after="cartAssertCartProduct1Page"/>
133117
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc1" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault1" after="cartCartGrabSimpleProduct2PageImageSrc1"/>
134118

119+
<!-- Check simple product2 in cart -->
135120
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart1" after="cartCartAssertSimpleProduct2PageImageNotDefault1"/>
136121
<actionGroup ref="StorefrontCheckCartSimpleProductActionGroup" stepKey="cartAssertCartSimpleProduct2" after="cartOpenCart1">
137122
<argument name="product" value="$$createSimpleProduct2$$"/>
@@ -148,28 +133,7 @@
148133
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
149134
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabSimpleProduct2PageImageSrc2" after="cartAssertCartProduct2Page"/>
150135
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabSimpleProduct2PageImageSrc2" stepKey="cartCartAssertSimpleProduct2PageImageNotDefault2" after="cartCartGrabSimpleProduct2PageImageSrc2"/>
151-
152-
<!-- @TODO: MAGETWO-80272 Move to Configurable -->
153-
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="cartCartAssertSimpleProduct2PageImageNotDefault2"/>
154-
<actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
155-
<argument name="product" value="$$createConfigProduct$$"/>
156-
<argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
157-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
158-
<argument name="productQuantity" value="CONST.one"/>
159-
</actionGroup>
160-
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
161-
<grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
162-
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
163-
<see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
164-
<click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
165-
<actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="cartClickCartConfigProduct">
166-
<argument name="product" value="$$createConfigProduct$$"/>
167-
<argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
168-
</actionGroup>
169-
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
170-
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
171-
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
172-
<comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertConfigProductPageImageNotDefault" />
136+
<comment userInput="End of adding products to cart" stepKey="endOfAddingProductsToCart" after="cartCartAssertSimpleProduct2PageImageNotDefault2" />
173137

174138
<!-- Step 6: Check out -->
175139
<comment userInput="Start of checking out" stepKey="startOfCheckingOut" after="endOfUsingCouponCode" />

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

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,47 @@
139139
<argument name="productCount" value="CONST.three"/>
140140
</actionGroup>
141141

142+
143+
<!-- Check configurable product in minicart -->
144+
<actionGroup ref="StorefrontOpenMinicartAndCheckConfigurableProductActionGroup" stepKey="cartOpenMinicartAndCheckConfigProduct" after="cartMinicartAssertSimpleProduct2PageImageNotDefault">
145+
<argument name="product" value="$$createConfigProduct$$"/>
146+
<argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
147+
</actionGroup>
148+
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
149+
<grabAttributeFrom selector="{{StorefrontMinicartSection.productImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartMinicartGrabConfigProductImageSrc" after="cartOpenMinicartAndCheckConfigProduct"/>
150+
<assertNotRegExp expected="'/placeholder\/thumbnail\.jpg/'" actual="$cartMinicartGrabConfigProductImageSrc" stepKey="cartMinicartAssertConfigProductImageNotDefault" after="cartMinicartGrabConfigProductImageSrc"/>
151+
<click selector="{{StorefrontMinicartSection.productOptionsDetailsByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProductDetails" after="cartMinicartAssertConfigProductImageNotDefault"/>
152+
<see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{StorefrontMinicartSection.productOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartMinicartCheckConfigProductOption" after="cartMinicartClickConfigProductDetails"/>
153+
<click selector="{{StorefrontMinicartSection.productLinkByName($$createConfigProduct.name$$)}}" stepKey="cartMinicartClickConfigProduct" after="cartMinicartCheckConfigProductOption"/>
154+
<actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertMinicartConfigProductPage" after="cartMinicartClickConfigProduct">
155+
<argument name="product" value="$$createConfigProduct$$"/>
156+
<argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
157+
</actionGroup>
158+
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
159+
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartMinicartGrabConfigProductPageImageSrc" after="cartAssertMinicartConfigProductPage"/>
160+
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartMinicartGrabConfigProductPageImageSrc" stepKey="cartMinicartAssertConfigProductPageImageNotDefault" after="cartMinicartGrabConfigProductPageImageSrc"/>
161+
162+
<!-- Check configurable product in cart -->
163+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart2" after="cartCartAssertSimpleProduct2PageImageNotDefault2"/>
164+
<actionGroup ref="StorefrontCheckCartConfigurableProductActionGroup" stepKey="cartAssertCartConfigProduct" after="cartOpenCart2">
165+
<argument name="product" value="$$createConfigProduct$$"/>
166+
<argument name="optionProduct" value="$$createConfigChildProduct2$$"/>
167+
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
168+
<argument name="productQuantity" value="CONST.one"/>
169+
</actionGroup>
170+
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
171+
<grabAttributeFrom selector="{{CheckoutCartProductSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="cartCartGrabConfigProduct2ImageSrc" after="cartAssertCartConfigProduct"/>
172+
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$cartCartGrabConfigProduct2ImageSrc" stepKey="cartCartAssertConfigProduct2ImageNotDefault" after="cartCartGrabConfigProduct2ImageSrc"/>
173+
<see userInput="$$createConfigProductAttributeOption2.option[store_labels][1][label]$$" selector="{{CheckoutCartProductSection.ProductOptionByNameAndAttribute($$createConfigProduct.name$$, $$createConfigProductAttribute.attribute[frontend_labels][0][label]$$)}}" stepKey="cartCheckConfigProductOption" after="cartCartAssertConfigProduct2ImageNotDefault"/>
174+
<click selector="{{CheckoutCartProductSection.ProductLinkByName($$createConfigProduct.name$$)}}" stepKey="cartClickCartConfigProduct" after="cartCheckConfigProductOption"/>
175+
<actionGroup ref="StorefrontCheckConfigurableProduct" stepKey="cartAssertCartConfigProductPage" after="cartClickCartConfigProduct">
176+
<argument name="product" value="$$createConfigProduct$$"/>
177+
<argument name="optionProduct" value="$$createConfigChildProduct1$$"/>
178+
</actionGroup>
179+
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
180+
<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="cartCartGrabConfigProductPageImageSrc" after="cartAssertCartConfigProductPage"/>
181+
<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$cartCartGrabConfigProductPageImageSrc" stepKey="cartCartAssertConfigProductPageImageNotDefault" after="cartCartGrabConfigProductPageImageSrc"/>
182+
142183
<!-- Add Configurable Product to comparison -->
143184
<actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="compareAssertConfigProduct" after="compareAddSimpleProduct2ToCompare">
144185
<argument name="product" value="$$createConfigProduct$$"/>
@@ -164,6 +205,5 @@
164205
<!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
165206
<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createConfigProduct.name$$)}}" userInput="src" stepKey="compareGrabConfigProductImageSrcInComparison" after="compareAssertConfigProductInComparison"/>
166207
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabConfigProductImageSrcInComparison" stepKey="compareAssertConfigProductImageNotDefaultInComparison" after="compareGrabConfigProductImageSrcInComparison"/>
167-
168-
</test>
208+
</test>
169209
</tests>

0 commit comments

Comments
 (0)