Merge branch '2.4.4-develop' into ph-delivery

xmav · web-flow · commit f16c7de5d303 · 2022-01-11T18:40:10.000-06:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPage2ActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPage2ActionGroup.xml
@@ -19,6 +19,6 @@
 
         <seeInCurrentUrl url="/{{product.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductImageStorefrontProductPageActionGroup.xml
@@ -19,6 +19,7 @@
 
         <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="waitForImage"/>
         <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeImage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml
@@ -16,6 +16,6 @@
         <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
         <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see userInput="You are signed out" stepKey="signOut"/>
+        <waitForText userInput="You are signed out" stepKey="signOut"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
@@ -62,8 +62,8 @@
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="createNewCustomerAccount">
             <argument name="customer" value="Simple_US_Customer" />
         </actionGroup>
-        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-        <waitForPageLoad stepKey="waitForCreateAccountButtonToLoad"/>
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAccountButton"/>
+        <comment userInput="BIC workaround" stepKey="waitForCreateAccountButtonToLoad"/>
 
         <!--Assert customer information-->
         <see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageAndPriceInStorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageAndPriceInStorefrontProductActionGroup.xml
@@ -19,7 +19,8 @@
         </arguments>
 
         <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
-        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
+        <waitForPageLoad stepKey="waitForOptionLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
         <see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.price}}" stepKey="seeProductPrice"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageInStorefrontProductPageActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertOptionImageInStorefrontProductPageActionGroup.xml
@@ -21,6 +21,7 @@
         <seeInCurrentUrl url="/{{product.urlKey}}.html" stepKey="checkUrl"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
+        <waitForPageLoad stepKey="waitForOptionLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile(image.filename)}}" stepKey="seeFirstImage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
@@ -212,9 +212,11 @@
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$-Updated"  stepKey="seeConfigurableProductName"/>
         <see userInput="{{productAttributeColor.default_label}}" selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" stepKey="seeColorAttributeName"/>
         <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectFirstOption"/>
+        <waitForPageLoad stepKey="waitForFirstOptionLoad"/>
         <see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertFirstOptionProductPrice"/>
         <seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeFirstImage"/>
         <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"  userInput="{{colorConfigurableProductAttribute1.name}}" stepKey="selectSecondOption"/>
+        <waitForPageLoad stepKey="waitForSecondOptionLoad"/>
         <see userInput="{{virtualProductWithRequiredFields.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeSecondOptionProductPrice"/>
         <seeElement selector="{{StorefrontProductMediaSection.imageFile(MagentoLogo.filename)}}" stepKey="seeSecondImage"/>
     </test>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml
@@ -16,6 +16,6 @@
         <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
         <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see userInput="You are signed out" stepKey="signOut"/>
+        <waitForText userInput="You are signed out" stepKey="signOut"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
@@ -21,6 +21,9 @@
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -17,9 +17,7 @@ define([
 ], function ($, _, ko, sectionConfig, url) {
     'use strict';
 
-    var options = {
-            cookieLifeTime: 86400 //1 day by default
-        },
+    var options = {},
         storage,
         storageInvalidation,
         invalidateCacheBySessionTimeOut,
@@ -32,22 +30,6 @@ define([
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
 
-    /**
-     * Storage initialization
-     */
-    function initStorage() {
-        $.cookieStorage.setConf({
-            path: '/',
-            expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000),
-            samesite: 'lax'
-        });
-        storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
-        storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
-    }
-
-    // Initialize storage with default parameters to prevent JS errors while component still not initialized
-    initStorage();
-
     /**
      * @param {Object} invalidateOptions
      */
@@ -234,7 +216,14 @@ define([
         /**
          * Storage init
          */
-        initStorage: initStorage,
+        initStorage: function () {
+            $.cookieStorage.setConf({
+                path: '/',
+                expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000)
+            });
+            storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
+            storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
+        },
 
         /**
          * Retrieve the list of sections that has expired since last page reload.
@@ -399,10 +388,7 @@ define([
          */
         'Magento_Customer/js/customer-data': function (settings) {
             options = settings;
-
-            // re-init storage with a new settings
             customerData.initStorage();
-
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
             customerData.init();
diff --git a/app/code/Magento/RemoteStorage/Setup/ConfigOptionsList.php b/app/code/Magento/RemoteStorage/Setup/ConfigOptionsList.php
@@ -142,6 +142,13 @@ public function getOptions(): array
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig): array
     {
+        $isRemoteStorageDeploymentConfigExists = isset($deploymentConfig->getConfigData()['remote_storage']);
+
+        // if remote storage config is already present and driver is not in $options, return early to prevent overwrite
+        if ($isRemoteStorageDeploymentConfigExists && !isset($options[self::OPTION_REMOTE_STORAGE_DRIVER])) {
+            return [];
+        }
+
         $driver = $options[self::OPTION_REMOTE_STORAGE_DRIVER] ?? DriverPool::FILE;
 
         if ($driver === DriverPool::FILE) {
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/RemoteStorage/Test/Unit/Setup/ConfigOptionsListTest.php
@@ -8,10 +8,10 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 use Magento\RemoteStorage\Driver\DriverFactoryPool;
 use Magento\RemoteStorage\Driver\RemoteDriverInterface;
 use Magento\RemoteStorage\Setup\ConfigOptionsList;
-use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -188,4 +188,115 @@ public function validateDataProvider()
             ],
         ];
     }
+
+    /**
+     * @param array $options
+     * @param array $deploymentConfig
+     * @param array $expectedConfigArr
+     * @dataProvider createConfigProvider
+     */
+    public function testCreateConfig(array $options, array $deploymentConfig, array $expectedConfigArr)
+    {
+        $deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $deploymentConfigMock
+            ->expects(static::once())
+            ->method('getConfigData')
+            ->willReturn($deploymentConfig);
+
+        $configDataListArr = $this->configOptionsList->createConfig($options, $deploymentConfigMock);
+
+        if (count($configDataListArr)) {
+            $this->assertCount(1, $configDataListArr);
+            $configDataArr = $configDataListArr[0]->getData();
+        } else {
+            $configDataArr = [];
+        }
+
+        $this->assertEquals(
+            $expectedConfigArr,
+            $configDataArr
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function createConfigProvider()
+    {
+        return [
+            'Remote Storage Options Missing and Remote Storage Deployment Config Present' => [
+                [
+                    'backend-frontname' => 'admin2022',
+                ],
+                [
+                    'remote_storage' => [
+                        'driver' => 'aws-s3',
+                    ]
+                ],
+                // no config data will be passed to write to deployment config
+                []
+            ],
+            'Remote Storage Options Missing and Remote Storage Deployment Config Missing' => [
+                [
+                    'backend-frontname' => 'admin2022',
+                ],
+                [],
+                [
+                    // will create default config with file driver
+                    'remote_storage' => [
+                        'driver' => 'file',
+                    ]
+                ]
+            ],
+            'Remote Storage Options Present and Remote Storage Deployment Config Missing' => [
+                [
+                    'remote-storage-driver' => 'aws-s3',
+                    'remote-storage-region' => 'us-east-1',
+                    'remote-storage-bucket' => 'bucket1',
+                    'remote-storage-prefix' => 'pre_',
+                ],
+                [],
+                [
+                    'remote_storage' => [
+                        'driver' => 'aws-s3',
+                        'prefix' => 'pre_',
+                        'config' => [
+                            'bucket' => 'bucket1',
+                            'region' => 'us-east-1',
+                        ],
+                    ]
+                ]
+            ],
+            'Remote Storage Options Present and Remote Storage Deployment Config Present' => [
+                [
+                    'remote-storage-driver' => 'aws-s3',
+                    'remote-storage-region' => 'us-east-1_NEW',
+                    'remote-storage-bucket' => 'bucket_NEW',
+                ],
+                [
+                    'remote_storage' => [
+                        'driver' => 'aws-s3',
+                        'prefix' => 'pre_OLD',
+                        'config' => [
+                            'bucket' => 'bucket_OLD',
+                            'region' => 'us-east-1_OLD',
+                        ],
+                    ]
+                ],
+                [
+                    'remote_storage' => [
+                        'driver' => 'aws-s3',
+                        // prefix should be removed as it was not passed in options
+                        'config' => [
+                            'bucket' => 'bucket_NEW',
+                            'region' => 'us-east-1_NEW',
+                        ],
+                    ]
+                ]
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
@@ -122,7 +122,7 @@
                                   stepKey="waitForElementNotDiscountVisible"/>
 
         <!-- Step 11. Log out from storefront -->
-        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="storefrontSignOut"/>
+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="storefrontSignOut"/>
 
         <!-- Step: 12-13. Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="openProductPage2"/>
diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/AdminClickViewThemeByThemeActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/AdminClickViewThemeByThemeActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminClickViewThemeBySpecifiedThemeActionGroup">
+        <annotations>
+            <description>Click the 'View' action of the specified theme on the themes grid.</description>
+        </annotations>
+        <arguments>
+            <argument name="theme" defaultValue="{{MagentoBlankTheme.themeTitle}}" type="string"/>
+        </arguments>
+        <click selector="{{AdminThemeSection.viewActionByTheme(theme)}}" stepKey="clickViewTheme"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
@@ -19,5 +19,6 @@
         <element name="gridCellUpdated" type="text" selector="//tbody//tr//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
         <element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="viewAction" type="button" selector="tr.data-row > td.data-grid-actions-cell > a.action-menu-item"/>
+        <element name="viewActionByTheme" type="button" selector="//tr[@class='data-row']//td//div[@class='data-grid-cell-content' and text()='{{theme}}']//ancestor::tr//td[@class='data-grid-actions-cell']/a[@class='action-menu-item']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesEditTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesEditTest.xml
@@ -32,7 +32,9 @@
             <argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
         </actionGroup>
 
-        <actionGroup ref="AdminClickViewThemeActionGroup" stepKey="editTheme"/>
+        <actionGroup ref="AdminClickViewThemeBySpecifiedThemeActionGroup" stepKey="editTheme">
+            <argument name="title" value="{{MagentoBlankTheme.themeTitle}}"/>
+        </actionGroup>
 
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seeEditPageTitle">
             <argument name="title" value="{{MagentoBlankTheme.pageTitle}}"/>
