MAGETWO-96406: [2.3.x] Swatch Attribute is not displayed in the Widget CMS

- Added fixes based on comments

Author: sona-sargsyan

app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml

@@ -30,6 +30,7 @@
         <click selector="{{WidgetSection.RuleParam}}" stepKey="clickToAddRuleParam"/>
         <click selector="{{WidgetSection.Chooser}}" stepKey="clickToSelectFromList"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{WidgetSection.RuleParamListExpander('1')}}" stepKey="expandRootCategory"/>
         <click selector="{{WidgetSection.PreCreateCategory(category)}}" stepKey="selectPreCategory" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickToSaveInsertedWidget"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml

@@ -101,6 +101,7 @@
         <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
         <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
         <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
+        <element name="RuleParamListExpander" selector="//div[@class='rule-chooser']//ul[contains(@class,'x-tree-root')]//li[{{arg3}}]//img[contains(@class,'x-tree-elbow-end-plus')]" parameterized="true"/>
         <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />

app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml

@@ -16,6 +16,8 @@
         <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
         <element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
         <element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
+        <element name="storefrontPropertiesTab" selector="#front_fieldset-wrapper"/>
+        <element name="storefrontPropertiesTitle" selector="//span[text()='Storefront Properties']"/>
         <element name="container" type="text" selector="#create_new_attribute"/>
         <element name="saveAttribute" type="button" selector="#save"/>
         <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>

app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml

@@ -70,9 +70,8 @@
         </arguments>
 
         <!-- Go to Storefront Properties tab -->
-        <scrollToTopOfPage stepKey="scrollToTop" after="fillDefaultStoreLabel2"/>
-        <click selector="#front_fieldset-wrapper" stepKey="goToStorefrontPropertiesTab" after="scrollToTop"/>
-        <waitForElementVisible selector="//span[text()='Storefront Properties']" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
+        <click selector="{{AdminNewAttributePanel.storefrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab" after="fillDefaultStoreLabel2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.storefrontPropertiesTitle}}" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
         <selectOption selector="{{AdminNewAttributePanel.useInSearch}}" stepKey="switchOnUsInSearch" userInput="Yes" after="waitTabLoad"/>
         <selectOption selector="{{AdminNewAttributePanel.visibleInAdvancedSearch}}" stepKey="switchOnVisibleInAdvancedSearch" userInput="Yes" after="switchOnUsInSearch"/>
         <selectOption selector="{{AdminNewAttributePanel.comparableOnStorefront}}" stepKey="switchOnComparableOnStorefront" userInput="Yes" after="switchOnVisibleInAdvancedSearch"/>

app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml

@@ -32,8 +32,8 @@
                 <argument name="ProductAttribute" value="visualSwatchAttribute"/>
             </actionGroup>
             <!--delete root category-->
-            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterCLIReindexCommand"/>
-            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoadAfterCLIReindexCommand"/>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoad"/>
             <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createRootCategory.name$$')}}" stepKey="clickOnDefaultRootCategory"/>
             <waitForPageLoad stepKey="waitForPageDefaultCategoryEditLoad" />
             <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent1"/>