From 8868ef9b8d86a2b506bbcb6a370b5bd43d3f7795 Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Thu, 22 Feb 2018 23:59:34 -0600 Subject: [PATCH 1/8] MAGETWO-87243: MFTF Image Assertion - Updated image assertion on Storefront regarding bug fixes of image URL --- .../PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml index ed1238d03da..09d19974f77 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml @@ -68,12 +68,12 @@ - - + + - + From 855a72ecd3107d4804ec836374fde5966c7a0b05 Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Fri, 23 Feb 2018 00:05:53 -0600 Subject: [PATCH 2/8] MAGETWO-87243: MFTF Image Assertion - Replace UploadImage.file by UploadImage.value --- .../PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml index 09d19974f77..eb7403f3ca4 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml @@ -57,10 +57,6 @@ - - - - From 6f6bf0f5193f8f982f63cf78999de7dc1b2f8f2f Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Sun, 4 Mar 2018 23:09:46 -0600 Subject: [PATCH 3/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG - Add conditionClick to see TinyMCE4 and change entity of productAttribute creation regarding changes from mainline --- .../PageBuilder/Test/AdminPageBuilderProductAttributeTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderProductAttributeTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderProductAttributeTest.xml index dd700677bb4..1446a3a839c 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderProductAttributeTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderProductAttributeTest.xml @@ -46,7 +46,7 @@ - + @@ -224,7 +224,7 @@ - + From 16b84ea1543ece357065de84481a2513aaa4f74e Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Mon, 5 Mar 2018 14:52:04 -0600 Subject: [PATCH 4/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG - Skip test ReadHtmlWithImage --- .../Test/AdminPageBuilderReadNonMasterFormatTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderReadNonMasterFormatTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderReadNonMasterFormatTest.xml index 48cec513c45..0b507894eda 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderReadNonMasterFormatTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderReadNonMasterFormatTest.xml @@ -144,6 +144,8 @@ + + From 7a0bee7f716ae308065e650ff8d9934a7915c377 Mon Sep 17 00:00:00 2001 From: Kieu Phan Date: Mon, 5 Mar 2018 18:04:03 -0600 Subject: [PATCH 5/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG - Skipped test StorefrontCustomerCheckoutTest which is not stable and name tests with stories and features --- .../PageBuilder/Test/AdminPageBuilderBannerTest.xml | 2 ++ .../PageBuilder/Test/AdminPageBuilderColumnTest.xml | 2 ++ .../PageBuilder/Test/AdminPageBuilderEnabledTest.xml | 8 ++++++++ .../PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml | 2 ++ 4 files changed, 14 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderBannerTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderBannerTest.xml index 150f69ad117..33ab687c2f5 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderBannerTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderBannerTest.xml @@ -4353,6 +4353,8 @@ + + <description value="A user should be able to add an image into a banner."/> <severity value="CRITICAL"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderColumnTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderColumnTest.xml index 4792e0e8c95..13563391087 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderColumnTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderColumnTest.xml @@ -1042,6 +1042,8 @@ </test> <test name="CanAddImageToColumn"> <annotations> + <features value="[CMS] Bluefoot Row MAGETWO-83767"/> + <stories value="[UI component] MediaGalleryImage: inside form MAGETWO-86533"/> <title value="Add an image content block into column"/> <description value="A user should be able to add an image into a column."/> <severity value="CRITICAL"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderEnabledTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderEnabledTest.xml index d6beeca3a2d..2db11613757 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderEnabledTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderEnabledTest.xml @@ -10,6 +10,8 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> <test name="VerifyPagebuilderSwitcherAndDisclaimerMessage"> <annotations> + <features value="Bluefoot integration (as extension) MAGETWO-68814"/> + <stories value="Enabling PageBuilder on Webstore MAGETWO-71404"/> <title value="Verify Disclaimer Message and Warning Message when disable PageBuilder"/> <description value="Verify Disclaimer Message and Warning Message when disable PageBuilder"/> <severity value="CRITICAL"/> @@ -52,6 +54,8 @@ </test> <test name="VerifyPageBuilderVisibleOnCatalog"> <annotations> + <features value="Bluefoot integration (as extension) MAGETWO-68814"/> + <stories value="Enabling PageBuilder on Webstore MAGETWO-71404"/> <title value="Admin are able to see PageBuilder on Catalog page after enable PageBuilder from Configuration"/> <description value="Admin are able to see PageBuilder on Catalog page after enable PageBuilder from Configuration"/> <severity value="CRITICAL"/> @@ -97,6 +101,8 @@ </test> <test name="VerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabled"> <annotations> + <features value="Bluefoot integration (as extension) MAGETWO-68814"/> + <stories value="Disable PageBuilder MAGETWO-86314"/> <title value="Admin should be able to see PageBuilder on CMS Page after enable PageBuilder and WYSIWYG from Configuration"/> <description value="Admin should be able to see PageBuilder on CMS Page after enable PageBuilder and WYSIWYG from Configuration"/> <severity value="CRITICAL"/> @@ -137,6 +143,8 @@ </test> <test name="VerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabled"> <annotations> + <features value="Bluefoot integration (as extension) MAGETWO-68814"/> + <stories value="Disable PageBuilder MAGETWO-86314"/> <title value="Admin should be able to see PageBuilder on CMS Block Page after enable PageBuilder and disable WYSIWYG from Configuration"/> <description value="Admin should be able to see PageBuilder on CMS Block Page after enable PageBuilder and disable WYSIWYG from Configuration"/> <severity value="CRITICAL"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml index eb7403f3ca4..739ef0f9222 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderImageCatalogTest.xml @@ -10,6 +10,8 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> <test name="UploadImageToCategory"> <annotations> + <features value="[CMS] Bluefoot Row MAGETWO-83767"/> + <stories value="[UI component] MediaGalleryImage: inside form MAGETWO-86533"/> <title value="User upload image to category"/> <description value="User upload image to category"/> <severity value="CRITICAL"/> From c974127b4a7580f08005e3257bdf52635de82da3 Mon Sep 17 00:00:00 2001 From: Kieu Phan <kphan@magento.com> Date: Tue, 6 Mar 2018 00:32:24 -0600 Subject: [PATCH 6/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG - Added wait for checkbox and added story for Row Test --- .../FunctionalTest/PageBuilder/Test/AdminPageBuilderRowTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderRowTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderRowTest.xml index 79c393296fb..c66e26368b9 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderRowTest.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderRowTest.xml @@ -719,6 +719,8 @@ </test> <test name="CanAddImageToRow"> <annotations> + <features value="[CMS] Bluefoot Row MAGETWO-83767"/> + <stories value="[UI component] MediaGalleryImage: inside form MAGETWO-86533"/> <title value="Add an image content block into row"/> <description value="A user should be able to add an image into slideout of row."/> <severity value="CRITICAL"/> From 49335908fc398182d1de11ec766f18c50af528c7 Mon Sep 17 00:00:00 2001 From: Kieu Phan <kphan@magento.com> Date: Tue, 6 Mar 2018 10:59:13 -0600 Subject: [PATCH 7/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG - Skip EndToEnd Scenario only on PageBuilder, split actionGroup to a separate file --- .../Catalog/Test/EndToEndB2CGuestUserTest.xml | 207 ++++++++++++++++++ .../Test/EndToEndB2CLoggedInUserTest.xml | 36 +++ 2 files changed, 243 insertions(+) create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml new file mode 100644 index 00000000000..7e1e5d57299 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml @@ -0,0 +1,207 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <!--<test name="EndToEndB2CGuestUserTest">--> + <!--<annotations>--> + <!--<features value="End to End scenarios"/>--> + <!--<stories value="B2C guest user - MAGETWO-75411"/>--> + <!--<group value="e2e"/>--> + <!--<group value="skip"/>--> + <!--Skipped; see: MAGETWO-88777--> + <!--<title value="You should be able to pass End to End B2C Guest User scenario"/>--> + <!--<description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>--> + <!--<severity value="CRITICAL"/>--> + <!--<testCaseId value="MAGETWO-87435"/>--> + <!--</annotations>--> + <!--<before>--> + <!--<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>--> + + <!--<createData entity="ApiCategory" stepKey="createCategory"/>--> + + <!--<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">--> + <!--<requiredEntity createDataKey="createCategory"/>--> + <!--</createData>--> + <!--<createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">--> + <!--<requiredEntity createDataKey="createSimpleProduct1"/>--> + <!--</createData>--> + <!--<createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">--> + <!--<requiredEntity createDataKey="createSimpleProduct1"/>--> + <!--</createData>--> + <!--<updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>--> + + <!--<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">--> + <!--<requiredEntity createDataKey="createCategory"/>--> + <!--</createData>--> + <!--<createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">--> + <!--<requiredEntity createDataKey="createSimpleProduct2"/>--> + <!--</createData>--> + <!--<updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>--> + <!--</before>--> + <!--<after>--> + <!--<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>--> + + <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> + <!--<!–<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>–>--> + <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> + <!--<!–<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>–>--> + <!--<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>--> + + <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> + <!--<!–<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>–>--> + <!--<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>--> + <!--</after>--> + + <!--<!– Step 1: User browses catalog –>--> + <!--<comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" />--> + <!--<amOnPage url="{{StorefrontHomePage}}" stepKey="amOnHomePage"/>--> + <!--<waitForPageLoad stepKey="homeWaitForPageLoad"/>--> + <!--<waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage"/>--> + <!--<see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>--> + + <!--<!– Open Category –>--> + <!--<comment userInput="Open category" stepKey="commentOpenCategory" />--> + <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>--> + <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">--> + <!--<argument name="category" value="$$createCategory$$"/>--> + <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> + <!--<argument name="productCount" value="CONST.three"/>--> + <!--</actionGroup>--> + <!--<!– Check simple product 1 in category –>--> + <!--<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />--> + <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">--> + <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault"/>--> + <!--<!– Check simple product 2 in category –>--> + <!--<comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" />--> + <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">--> + <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault"/>--> + + <!--<!– View Simple Product 1 –>--> + <!--<comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>--> + <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>--> + <!--<waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" />--> + <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">--> + <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault"/>--> + + <!--<!– View Simple Product 2 –>--> + <!--<comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" />--> + <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1"/>--> + <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View"/>--> + <!--<waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" />--> + <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">--> + <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault"/>--> + <!--<comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>--> + + <!--<!– Step 4: User compares products –>--> + <!--<comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>--> + <!--<!– Add Simple Product 1 to comparison –>--> + <!--<comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" />--> + <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" />--> + <!--<waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" />--> + <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">--> + <!--<argument name="category" value="$$createCategory$$"/>--> + <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> + <!--<argument name="productCount" value="CONST.three"/>--> + <!--</actionGroup>--> + <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">--> + <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault"/>--> + <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1"/>--> + <!--<waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" />--> + <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page">--> + <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault"/>--> + <!--<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">--> + <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + + <!--<!– Add Simple Product 2 to comparison –>--> + <!--<comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" />--> + <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1"/>--> + <!--<waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" />--> + <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">--> + <!--<argument name="category" value="$$createCategory$$"/>--> + <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> + <!--<argument name="productCount" value="CONST.three"/>--> + <!--</actionGroup>--> + <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">--> + <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault"/>--> + <!--<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">--> + <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + + <!--<!– Check products in comparison sidebar –>--> + <!--<!– Check simple product 1 in comparison sidebar –>--> + <!--<comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>--> + <!--<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">--> + <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– Check simple product 2 in comparison sidebar –>--> + <!--<comment userInput="Check simple product 2 in comparison sidebar" stepKey="commentCheckSimpleProduct2InComparisonSidebar" />--> + <!--<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar">--> + <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + + <!--<!– Check products on comparison page –>--> + <!--<!– Check simple product 1 on comparison page –>--> + <!--<comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>--> + <!--<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>--> + <!--<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison">--> + <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison"/>--> + <!--<!– Check simple product2 on comparison page –>--> + <!--<comment userInput="Check simple product 2 on comparison page" stepKey="commentCheckSimpleProduct2OnComparisonPage" />--> + <!--<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison">--> + <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> + <!--</actionGroup>--> + <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> + <!--<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison"/>--> + <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>--> + + <!--<!– Clear comparison sidebar –>--> + <!--<comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>--> + <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>--> + <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">--> + <!--<argument name="category" value="$$createCategory$$"/>--> + <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> + <!--<argument name="productCount" value="CONST.three"/>--> + <!--</actionGroup>--> + <!--<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>--> + <!--<comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />--> + <!--</test>--> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml new file mode 100644 index 00000000000..0c393bcc1bd --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <!--<test name="EndToEndB2CLoggedInUserTest">--> + <!--<annotations>--> + <!--<features value="End to End scenarios"/>--> + <!--<stories value="B2C logged in user - MAGETWO-72524"/>--> + <!--<group value="e2e"/>--> + <!--<group value="skip"/>--> + <!--Skipped; see: MAGETWO-88777--> + <!--<title value="You should be able to pass End to End B2C Logged In User scenario"/>--> + <!--<description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>--> + <!--<severity value="CRITICAL"/>--> + <!--<testCaseId value="MAGETWO-87653"/>--> + <!--</annotations>--> + <!--<before>--> + <!--<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>--> + <!--</before>--> + <!--<after>--> + <!--<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>--> + <!--</after>--> + <!--<!– Step 0: User signs up an account –>--> + <!--<comment userInput="Start of signing up user account" stepKey="startOfSigningUpUserAccount" />--> + <!--<actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">--> + <!--<argument name="Customer" value="CustomerEntityOne"/>--> + <!--</actionGroup>--> + <!--<comment userInput="End of signing up user account" stepKey="endOfSigningUpUserAccount" />--> + <!--</test>--> +</tests> From adc3a7178e2cf505904aa789586192b18e1eff87 Mon Sep 17 00:00:00 2001 From: Kieu Phan <kphan@magento.com> Date: Tue, 6 Mar 2018 13:35:46 -0600 Subject: [PATCH 8/8] MAGETWO-87243: Unskip failing MFTF tests for WYSIWYG --- .../Catalog/Test/EndToEndB2CGuestUserTest.xml | 207 ------------------ .../Test/EndToEndB2CLoggedInUserTest.xml | 36 --- .../Test/EndToEndB2CGuestUserTest.xml | 17 ++ .../Test/EndToEndB2CLoggedInUserTest.xml | 17 ++ 4 files changed, 34 insertions(+), 243 deletions(-) delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CGuestUserTest.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CLoggedInUserTest.xml diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml deleted file mode 100644 index 7e1e5d57299..00000000000 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml +++ /dev/null @@ -1,207 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> - <!--<test name="EndToEndB2CGuestUserTest">--> - <!--<annotations>--> - <!--<features value="End to End scenarios"/>--> - <!--<stories value="B2C guest user - MAGETWO-75411"/>--> - <!--<group value="e2e"/>--> - <!--<group value="skip"/>--> - <!--Skipped; see: MAGETWO-88777--> - <!--<title value="You should be able to pass End to End B2C Guest User scenario"/>--> - <!--<description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>--> - <!--<severity value="CRITICAL"/>--> - <!--<testCaseId value="MAGETWO-87435"/>--> - <!--</annotations>--> - <!--<before>--> - <!--<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>--> - - <!--<createData entity="ApiCategory" stepKey="createCategory"/>--> - - <!--<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">--> - <!--<requiredEntity createDataKey="createCategory"/>--> - <!--</createData>--> - <!--<createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct1Image">--> - <!--<requiredEntity createDataKey="createSimpleProduct1"/>--> - <!--</createData>--> - <!--<createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createSimpleProduct1Image1">--> - <!--<requiredEntity createDataKey="createSimpleProduct1"/>--> - <!--</createData>--> - <!--<updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createSimpleProduct1"/>--> - - <!--<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct2">--> - <!--<requiredEntity createDataKey="createCategory"/>--> - <!--</createData>--> - <!--<createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createSimpleProduct2Image">--> - <!--<requiredEntity createDataKey="createSimpleProduct2"/>--> - <!--</createData>--> - <!--<updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct2" createDataKey="createSimpleProduct2"/>--> - <!--</before>--> - <!--<after>--> - <!--<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>--> - - <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> - <!--<!–<deleteData createDataKey="createSimpleProduct1Image" stepKey="deleteSimpleProduct1Image"/>–>--> - <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> - <!--<!–<deleteData createDataKey="createSimpleProduct1Image1" stepKey="deleteSimpleProduct1Image1"/>–>--> - <!--<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>--> - - <!--<!– @TODO: Uncomment once MQE-679 is fixed –>--> - <!--<!–<deleteData createDataKey="createSimpleProduct2Image" stepKey="deleteSimpleProduct2Image"/>–>--> - <!--<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>--> - <!--</after>--> - - <!--<!– Step 1: User browses catalog –>--> - <!--<comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog" />--> - <!--<amOnPage url="{{StorefrontHomePage}}" stepKey="amOnHomePage"/>--> - <!--<waitForPageLoad stepKey="homeWaitForPageLoad"/>--> - <!--<waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeWaitForWelcomeMessage"/>--> - <!--<see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="homeCheckWelcome"/>--> - - <!--<!– Open Category –>--> - <!--<comment userInput="Open category" stepKey="commentOpenCategory" />--> - <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>--> - <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">--> - <!--<argument name="category" value="$$createCategory$$"/>--> - <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> - <!--<argument name="productCount" value="CONST.three"/>--> - <!--</actionGroup>--> - <!--<!– Check simple product 1 in category –>--> - <!--<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />--> - <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">--> - <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct1ImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct1ImageSrc" stepKey="browseAssertSimpleProduct1ImageNotDefault"/>--> - <!--<!– Check simple product 2 in category –>--> - <!--<comment userInput="Check simple product 2 in category" stepKey="commentCheckSimpleProduct2InCategory" />--> - <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">--> - <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="browseGrabSimpleProduct2ImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$browseGrabSimpleProduct2ImageSrc" stepKey="browseAssertSimpleProduct2ImageNotDefault"/>--> - - <!--<!– View Simple Product 1 –>--> - <!--<comment userInput="View simple product 1" stepKey="commentViewSimpleProduct1" after="browseAssertSimpleProduct2ImageNotDefault"/>--> - <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="browseClickCategorySimpleProduct1View" after="commentViewSimpleProduct1"/>--> - <!--<waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct1Viewloaded" />--> - <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">--> - <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct1PageImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct1PageImageSrc" stepKey="browseAssertSimpleProduct1PageImageNotDefault"/>--> - - <!--<!– View Simple Product 2 –>--> - <!--<comment userInput="View simple product 2" stepKey="commentViewSimpleProduct2" />--> - <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="clickCategory1"/>--> - <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct2.name$$)}}" stepKey="browseClickCategorySimpleProduct2View"/>--> - <!--<waitForLoadingMaskToDisappear stepKey="waitForSimpleProduct2ViewLoaded" />--> - <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">--> - <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="browseGrabSimpleProduct2PageImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$browseGrabSimpleProduct2PageImageSrc" stepKey="browseAssertSimpleProduct2PageImageNotDefault"/>--> - <!--<comment userInput="End of browsing catalog" stepKey="endOfBrowsingCatalog" after="browseAssertSimpleProduct2PageImageNotDefault"/>--> - - <!--<!– Step 4: User compares products –>--> - <!--<comment userInput="Start of comparing products" stepKey="startOfComparingProducts" after="endOfBrowsingCatalog"/>--> - <!--<!– Add Simple Product 1 to comparison –>--> - <!--<comment userInput="Add simple product 1 to comparison" stepKey="commentAddSimpleProduct1ToComparison" />--> - <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory" />--> - <!--<waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" />--> - <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">--> - <!--<argument name="category" value="$$createCategory$$"/>--> - <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> - <!--<argument name="productCount" value="CONST.three"/>--> - <!--</actionGroup>--> - <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">--> - <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrc" stepKey="compareAssertSimpleProduct1ImageNotDefault"/>--> - <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct1.name$$)}}" stepKey="compareClickSimpleProduct1"/>--> - <!--<waitForLoadingMaskToDisappear stepKey="waitForCompareSimpleProduct1loaded" />--> - <!--<actionGroup ref="StorefrontCheckSimpleProduct" stepKey="compareAssertProduct1Page">--> - <!--<argument name="product" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="compareGrabSimpleProduct1PageImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$compareGrabSimpleProduct1PageImageSrc" stepKey="compareAssertSimpleProduct2PageImageNotDefault"/>--> - <!--<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="compareAddSimpleProduct1ToCompare">--> - <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - - <!--<!– Add Simple Product 2 to comparison –>--> - <!--<comment userInput="Add simple product 2 to comparison" stepKey="commentAddSimpleProduct2ToComparison" />--> - <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategory1"/>--> - <!--<waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" />--> - <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">--> - <!--<argument name="category" value="$$createCategory$$"/>--> - <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> - <!--<argument name="productCount" value="CONST.three"/>--> - <!--</actionGroup>--> - <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">--> - <!--<argument name="product" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrc"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrc" stepKey="compareAssertSimpleProduct2ImageNotDefault"/>--> - <!--<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="compareAddSimpleProduct2ToCompare">--> - <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - - <!--<!– Check products in comparison sidebar –>--> - <!--<!– Check simple product 1 in comparison sidebar –>--> - <!--<comment userInput="Check simple product 1 in comparison sidebar" stepKey="commentCheckSimpleProduct1InComparisonSidebar" after="compareAddSimpleProduct2ToCompare"/>--> - <!--<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct1InSidebar" after="commentCheckSimpleProduct1InComparisonSidebar">--> - <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– Check simple product 2 in comparison sidebar –>--> - <!--<comment userInput="Check simple product 2 in comparison sidebar" stepKey="commentCheckSimpleProduct2InComparisonSidebar" />--> - <!--<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="compareSimpleProduct2InSidebar">--> - <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - - <!--<!– Check products on comparison page –>--> - <!--<!– Check simple product 1 on comparison page –>--> - <!--<comment userInput="Check simple product 1 on comparison page" stepKey="commentCheckSimpleProduct1OnComparisonPage" after="compareSimpleProduct2InSidebar"/>--> - <!--<actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage" after="commentCheckSimpleProduct1OnComparisonPage"/>--> - <!--<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct1InComparison">--> - <!--<argument name="productVar" value="$$createSimpleProduct1$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct1.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct1ImageSrcInComparison"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct1ImageSrcInComparison" stepKey="compareAssertSimpleProduct1ImageNotDefaultInComparison"/>--> - <!--<!– Check simple product2 on comparison page –>--> - <!--<comment userInput="Check simple product 2 on comparison page" stepKey="commentCheckSimpleProduct2OnComparisonPage" />--> - <!--<actionGroup ref="StorefrontCheckCompareSimpleProductActionGroup" stepKey="compareAssertSimpleProduct2InComparison">--> - <!--<argument name="productVar" value="$$createSimpleProduct2$$"/>--> - <!--</actionGroup>--> - <!--<!– @TODO: Move Image check to action group after MQE-697 is fixed –>--> - <!--<grabAttributeFrom selector="{{StorefrontProductCompareMainSection.ProductImageByName($$createSimpleProduct2.name$$)}}" userInput="src" stepKey="compareGrabSimpleProduct2ImageSrcInComparison"/>--> - <!--<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$compareGrabSimpleProduct2ImageSrcInComparison" stepKey="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>--> - - <!--<!– Clear comparison sidebar –>--> - <!--<comment userInput="Clear comparison sidebar" stepKey="commentClearComparisonSidebar" after="compareAssertSimpleProduct2ImageNotDefaultInComparison"/>--> - <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>--> - <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">--> - <!--<argument name="category" value="$$createCategory$$"/>--> - <!--<!– @TODO: Change to scalar value after MQE-498 is implemented –>--> - <!--<argument name="productCount" value="CONST.three"/>--> - <!--</actionGroup>--> - <!--<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>--> - <!--<comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />--> - <!--</test>--> -</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml deleted file mode 100644 index 0c393bcc1bd..00000000000 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> - <!--<test name="EndToEndB2CLoggedInUserTest">--> - <!--<annotations>--> - <!--<features value="End to End scenarios"/>--> - <!--<stories value="B2C logged in user - MAGETWO-72524"/>--> - <!--<group value="e2e"/>--> - <!--<group value="skip"/>--> - <!--Skipped; see: MAGETWO-88777--> - <!--<title value="You should be able to pass End to End B2C Logged In User scenario"/>--> - <!--<description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>--> - <!--<severity value="CRITICAL"/>--> - <!--<testCaseId value="MAGETWO-87653"/>--> - <!--</annotations>--> - <!--<before>--> - <!--<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>--> - <!--</before>--> - <!--<after>--> - <!--<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>--> - <!--</after>--> - <!--<!– Step 0: User signs up an account –>--> - <!--<comment userInput="Start of signing up user account" stepKey="startOfSigningUpUserAccount" />--> - <!--<actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">--> - <!--<argument name="Customer" value="CustomerEntityOne"/>--> - <!--</actionGroup>--> - <!--<comment userInput="End of signing up user account" stepKey="endOfSigningUpUserAccount" />--> - <!--</test>--> -</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CGuestUserTest.xml new file mode 100644 index 00000000000..09b8bfe7efc --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CGuestUserTest.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="EndToEndB2CGuestUserTest"> + <annotations> + <group value="skip"/> + <!--https://jira.corp.magento.com/browse/MAGETWO-88777--> + </annotations> + </test> +</tests> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CLoggedInUserTest.xml new file mode 100644 index 00000000000..2fefacf0506 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/EndToEndB2CLoggedInUserTest.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> + <test name="EndToEndB2CLoggedInUserTest"> + <annotations> + <group value="skip"/> + <!--https://jira.corp.magento.com/browse/MAGETWO-88777--> + </annotations> + </test> +</tests>