Merge branch 'ACQE-5684' into ACQE-6098-functional-mainline-ce

Author: akaash

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml

@@ -45,5 +45,6 @@
         <element name="productAttributeOptionValue" type="button" selector="//div[@id='narrow-by-list']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="outOfStockProductCategoryPage" type="text" selector="//div[@class='stock unavailable']//span[text()='Out of stock']"/>
         <element name="ListedProductAttributes" type="block" selector="//div[@aria-label='{{vs_attribute}}']//div[@aria-label='{{attribute_name}}']" parameterized="true"/>
+        <element name="quickOrderLink" type="text" selector="//div[@class='panel header']//a[text()='Quick Order']" />
     </section>
 </sections>

app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml

@@ -28,5 +28,6 @@
         <element name="defaultCurrencyCheckbox" type="checkbox" selector="#currency_options_default_inherit"/>
         <element name="allowedCurrencyCheckbox" type="checkbox" selector="#currency_options_allow_inherit"/>
         <element name="baseCurrency" type="button" selector="#currency_options_base"/>
+        <element name="selectWebsiteName" type="button" selector="//a[@data-role='website-id' and contains(text(),'{{selectWebsite}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchDefaultConfigWebsiteActionGroup.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSwitchDefaultConfigWebsiteActionGroup">
+        <!-- Admin switch default config between websites -->
+        <annotations>
+            <description>Goes to the Store Configuration page. Click on the default config and switch between the websites.</description>
+        </annotations>
+        <arguments>
+            <argument name="newWebsiteName" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminB2BConfigPage.url}}" stepKey="goToB2BFeaturesPage3"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+
+        <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{newWebsiteName}}" stepKey="seeAssertWebsiteInDefaultConfigDropdown"/>
+
+        <click selector="{{AdminConfigSection.selectWebsiteName(newWebsiteName)}}" stepKey="clickSaveWebsite"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForElementVisible"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
+    </actionGroup>
+</actionGroups>