Merge branch 'MQE-3576_CE' into functional--test--automation

update commits

Author: Manjusha.S

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeWithDefaultLayeredNavigationActionGroup.xml

@@ -19,6 +19,8 @@
             <argument name="option3" defaultValue="colorProductAttribute3"/>
         </arguments>
 
+        <scrollTo selector="//div/strong[@class='admin__collapsible-title']/span[contains(text(),'Configurations')]" stepKey="scrollToConfigurableProductButton"/>
+        <waitForElementVisible selector="button[data-index='create_configurable_products_button']" time="30" stepKey="waitForELementVisible"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
         <waitForPageLoad stepKey="waitForIFrame"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminGotoSelectValueAttributePageActionGroup.xml

@@ -16,7 +16,8 @@
         <arguments>
             <argument name="defaultLabelAttribute" type="string" defaultValue="{{colorProductAttribute.default_label}}"/>
         </arguments>
-
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForPageLoad stepKey="waitForFilters"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
         <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}"  userInput="{{defaultLabelAttribute}}" stepKey="fillFilterAttributeCodeField"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateNewAttributeActionGroup.xml

@@ -49,7 +49,7 @@
         <!--Click Save Attribute button-->
         <click selector="{{NewProduct.saveAttributeButton}}" stepKey="clickSaveAttributeButton"/>
         <waitForPageLoad stepKey="waitForSavingSettings"/>
-
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
         <!--Select created Attribute -->
         <click selector="{{ConfigurableProductSection.selectCreatedAttribute}}" stepKey="selectCreatedAttribute"/>
 

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

@@ -18,8 +18,11 @@
         </arguments>
 
         <grabAttributeFrom selector="{{AdminManageSwatchSection.nthSwatch(nthSwatch)}}" userInput="style" stepKey="grabStyle1"/>
+        <helper class="Magento\Swatches\Test\Mftf\Helper\ColorCode" method="colorCode" stepKey="colorCode">
+            <argument name="colorCode">{$grabStyle1}</argument>
+        </helper>
         <assertEquals stepKey="assertStyle1">
-            <actualResult type="string">{$grabStyle1}</actualResult>
+            <actualResult type="string">{$colorCode}</actualResult>
             <expectedResult type="string">{{expectedStyle}}</expectedResult>
         </assertEquals>
     </actionGroup>

app/code/Magento/Swatches/Test/Mftf/Helper/ColorCode.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Magento\Swatches\Test\Mftf\Helper;
+
+use Magento\FunctionalTestingFramework\Helper\Helper;
+
+/**
+ * Class ColorCode provides an ability to color code manipulation.
+ */
+class ColorCode extends Helper
+{
+    /**
+     * Color code check.
+     *
+     * @param string $colorCode
+     * @return string
+     */
+    public function colorCode(string $colorCode): string
+    {
+        $colorCode = str_replace('background: #', '', $colorCode);
+        if (!preg_match('/^[a-f0-9]{6}$/i', $colorCode) ) {
+            return $colorCode;
+        }
+
+        $length   = strlen($colorCode);
+        $rgbColorCode['r'] = hexdec($length == 6 ? substr($colorCode, 0, 2) : ($length == 3 ? str_repeat(substr($colorCode, 0, 1), 2) : 0));
+        $rgbColorCode['g'] = hexdec($length == 6 ? substr($colorCode, 2, 2) : ($length == 3 ? str_repeat(substr($colorCode, 1, 1), 2) : 0));
+        $rgbColorCode['b'] = hexdec($length == 6 ? substr($colorCode, 4, 2) : ($length == 3 ? str_repeat(substr($colorCode, 2, 1), 2) : 0));
+
+        return 'background: rgb('.implode(', ', $rgbColorCode).');';
+    }
+}