Merge pull request #160 from magento-arcticfoxes/B2B-2086

B2B-2086: [AWS S3] Failed to save swatch attribute
magento · Dec 14, 2021 · 0bb65b8 · 0bb65b8
2 parents c416ddf + ce910bd
commit 0bb65b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/...Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml b/...Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml
@@ -86,6 +86,8 @@
         <switchToIFrame stepKey="switchToParentPage" after="clickSaveAttribute"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
         <!--Find new attribute in grid and select-->
+        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" time="30" stepKey="waitForNewAttributePanelClose" />
+        <waitForPageLoad stepKey="waitLoadingLoadPageWithFilters"/>
         <conditionalClick selector="(//div[@class='admin__data-grid-header']//button[@data-action='grid-filter-reset'])[last()]" dependentSelector="(//div[@class='admin__data-grid-header']//button[@data-action='grid-filter-reset'])[last()]" visible="true" stepKey="clickClearFilters1"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="openFilterPanel"/>
         <waitForPageLoad stepKey="waitForPageLoad12" time="10"/>
@@ -136,6 +138,7 @@
             <argument name="product" value="ConfigurableMsiProduct"/>
         </actionGroup>
         <!-- Assert product text swatch -->
+        <waitForPageLoad stepKey="waitForPageLoadProductSwatchAssert" />
         <seeElement selector="{{StorefrontProductInfoMainSection.productSwatchText(textSwatchProductAttribute1.adminSwatch)}}" stepKey="assertSwatch1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productSwatchText(textSwatchProductAttribute2.adminSwatch)}}" stepKey="assertSwatch2"/>
 

diff --git a/...Ui/Test/Mftf/Test/AdminConfigurableProductCustomStockMainWebsitePriceVerificationTest.xml b/...Ui/Test/Mftf/Test/AdminConfigurableProductCustomStockMainWebsitePriceVerificationTest.xml
@@ -97,7 +97,9 @@
         <fillField selector="input[name='swatchtext[value][option_1][1]']" userInput="{{textSwatch2.name}}" stepKey="fillSecondOptionDefaultStoreViewName"/>
         <fillField selector="input[name='optiontext[value][option_1][1]']" userInput="{{textSwatch2.name}}" stepKey="fillSecondOptionDefaultStoreViewDescription"/>
         <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="saveAttribute"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
         <switchToIFrame stepKey="switchOutOfIFrame"/>
+        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" time="30" stepKey="waitForNewAttributePanelClose" />
         <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="findAttributeForVariations">
             <argument name="selector" value="AdminAssignProductAttributeSlideOutSection.attributeLabel"/>
             <argument name="value" value="{{visualSwatchAttribute.name}}"/>

diff --git a/...Mftf/Test/AdminCreateConfigurableProductTextSwatchAttributeCustomStockMainWebsiteTest.xml b/...Mftf/Test/AdminCreateConfigurableProductTextSwatchAttributeCustomStockMainWebsiteTest.xml
@@ -91,6 +91,8 @@
         <fillField selector="input[name='optiontext[value][option_1][1]']" userInput="{{textSwatch2.name}}" stepKey="fillSecondOptionDefaultStoreViewDescription"/>
         <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="saveAttribute"/>
         <switchToIFrame stepKey="switchOutOfIFrame1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <waitForElementNotVisible selector="{{AdminNewAttributePanel.container}}" time="30" stepKey="waitForNewAttributePanelClose" />
         <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="findAttributeForVariations">
             <argument name="selector" value="AdminAssignProductAttributeSlideOutSection.attributeLabel"/>
             <argument name="value" value="{{visualSwatchAttribute.name}}"/>
@@ -101,6 +103,7 @@
         <!--Assign additional source.-->
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="navigateToThirdStep"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="applySingleQuantityToVariations"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
         <click selector="{{AdminConfigurableProductAssignSourcesSlideOut.assignSources}}" stepKey="clickOnAssignSources"/>
         <conditionalClick selector="(//div[@class='admin__data-grid-header']//*[@data-action='grid-filter-reset'])[1]" dependentSelector="(//div[@class='admin__data-grid-header']//*[@data-action='grid-filter-reset'])[1]" visible="true" stepKey="clickClearFilters1"/>
         <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="searchAdditionalSource">