Merge remote-tracking branch 'trigger/MAGETWO-95588' into BugFixPR

Author: Joan He

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

@@ -75,5 +75,6 @@
         <element name="Scope" type="select" selector="#is_global"/>
         <element name="AddToColumnOptions" type="select" selector="#is_used_in_grid"/>
         <element name="UseInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
+        <element name="UseInProductListing" type="select" selector="#used_in_product_listing"/>
     </section>
 </sections>

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

@@ -19,10 +19,12 @@
             <group value="Swatches"/>
         </annotations>
         <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <!-- Begin creating a new product attribute of type "Image Swatch" -->
@@ -67,6 +69,11 @@
         <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
         <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectGlobalScope"/>
 
+        <scrollToTopOfPage stepKey="scrollToTabs"/>
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" stepKey="waitForTabSwitch"/>
+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInProductListing}}" userInput="Yes" stepKey="useInProductListing"/>
+
         <!-- Save the new product attribute -->
         <click selector="{{AttributePropertiesSection.SaveAndEdit}}" stepKey="clickSaveAndEdit1"/>
         <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
@@ -97,6 +104,7 @@
         <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
 
         <!-- Create configurations based off the Image Swatch we created earlier -->
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
@@ -134,5 +142,26 @@
             <expectedResult type="string">adobe-base</expectedResult>
             <actualResult type="string">{$grabSwatch6}</actualResult>
         </assertContains>
+
+        <!-- Go to the product listing page and see text swatch options -->
+        <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPageStorefront"/>
+        <waitForPageLoad stepKey="waitForProductListingPage"/>
+
+        <!-- Verify the storefront -->
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('1')}}" userInput="style" stepKey="grabSwatch7"/>
+        <assertContains stepKey="assertSwatch7">
+            <expectedResult type="string">adobe-thumb</expectedResult>
+            <actualResult type="string">{$grabSwatch7}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('2')}}" userInput="style" stepKey="grabSwatch8"/>
+        <assertContains stepKey="assertSwatch8">
+            <expectedResult type="string">adobe-small</expectedResult>
+            <actualResult type="string">{$grabSwatch8}</actualResult>
+        </assertContains>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.nthSwatchOption('3')}}" userInput="style" stepKey="grabSwatch9"/>
+        <assertContains stepKey="assertSwatch9">
+            <expectedResult type="string">adobe-base</expectedResult>
+            <actualResult type="string">{$grabSwatch9}</actualResult>
+        </assertContains>
     </test>
 </tests>

app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml

@@ -21,7 +21,8 @@ $productId = $block->getProduct()->getId();
                 "numberToShow": <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct(); ?>,
                 "jsonConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig(); ?>,
                 "jsonSwatchConfig": <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig(); ?>,
-                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>"
+                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
+                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
             }
         }
     }