From 1d19c628c8accab2db4fb3165bde4206153b38ff Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Mon, 31 May 2021 16:15:53 +0100
Subject: [PATCH 01/27] github 32996 - create a Directory module region updater
 that relies on MySQL ordering of regions for the region drop down

---
 .../ViewModel/Address/RegionProvider.php      |  76 +++++
 .../layout/customer_account_create.xml        |   2 +
 .../frontend/layout/customer_address_form.xml |   1 +
 .../frontend/templates/address/edit.phtml     |   6 +-
 .../frontend/templates/form/register.phtml    |   6 +-
 .../view/frontend/requirejs-config.js         |  12 +
 .../view/frontend/web/js/region-updater.js    | 260 ++++++++++++++++++
 7 files changed, 359 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
 create mode 100644 app/code/Magento/Directory/view/frontend/requirejs-config.js
 create mode 100644 app/code/Magento/Directory/view/frontend/web/js/region-updater.js

diff --git a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
new file mode 100644
index 0000000000000..5c7921cd8a244
--- /dev/null
+++ b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * RegionProvider
+ *
+ * @copyright Copyright © 2021 Staempfli AG. All rights reserved.
+ * @author    juan.alonso@staempfli.com
+ */
+
+namespace Magento\Customer\ViewModel\Address;
+
+use Magento\Directory\Helper\Data as DataHelper;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+class RegionProvider implements ArgumentInterface
+{
+
+
+    protected $regions = [];
+
+    /**
+     * @var DataHelper
+     */
+    private $directoryHelper;
+    /**
+     * @var JsonSerializer
+     */
+    private $jsonSerializer;
+
+
+    /**
+     * Constructor
+     *
+     * @param DataHelper $directoryHelper
+     * @param JsonSerializer $jsonSerializer
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        DataHelper $directoryHelper,
+        JsonSerializer $jsonSerializer
+    ) {
+        $this->directoryHelper= $directoryHelper;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    public function getRegionJson() : string
+    {
+        $regions = $this->getRegions();
+        return $this->jsonSerializer->serialize($regions);
+    }
+
+
+    /**
+     * @return array
+     */
+    protected function getRegions() : array
+    {
+        if (!$this->regions) {
+            $regions = $this->directoryHelper->getRegionData();
+            $this->regions['config'] = $regions['config'];
+            unset($regions['config']);
+            foreach ($regions as $countryCode => $countryRegions) {
+                foreach ($countryRegions as $regionId => $regionData) {
+                    $this->regions[$countryCode][] = [
+                        'id'   => $regionId,
+                        'name' => $regionData['name'],
+                        'code' => $regionData['code']
+                    ];
+                }
+            }
+
+        }
+        return $this->regions;
+    }
+
+}
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
index 0c5af453f2373..cf16857592431 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
@@ -17,6 +17,8 @@
             <block class="Magento\Customer\Block\Form\Register" name="customer_form_register" template="Magento_Customer::form/register.phtml">
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                    <argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
+                    <argument name="show_address_fields" xsi:type="boolean">true</argument>
                 </arguments>
                 <container name="form.additional.info" as="form_additional_info"/>
                 <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index 29343c6066846..9a89f588bc750 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -22,6 +22,7 @@
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
                     <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                     <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Address</argument>
+                    <argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 71ac56475ae84..4622fac631270 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -8,7 +8,9 @@
 /** @var \Magento\Customer\ViewModel\Address $viewModel */
 /** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
 $viewModel = $block->getViewModel();
+$regionProvider = $block->getRegionProvider();
 ?>
 <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
 <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
@@ -222,13 +224,13 @@ $viewModel = $block->getViewModel();
             }
         },
         "#country": {
-            "regionUpdater": {
+            "directoryRegionUpdater": {
                 "optionalRegionAllowed": <?= /* @noEscape */ $_displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $viewModel->dataGetRegionJson() ?>,
+                "regionJson": <?= /* @noEscape */ $regionProvider->getRegionJson(); ?>,
                 "defaultRegion": "<?= (int) $block->getRegionId() ?>",
                 "countriesWithOptionalZip": <?= /* @noEscape */ $viewModel->dataGetCountriesWithOptionalZip(true) ?>
             }
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 0394f112b1424..d08f201663803 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -14,6 +14,8 @@ use Magento\Customer\Helper\Address;
 $addressHelper = $block->getData('addressHelper');
 /** @var \Magento\Directory\Helper\Data $directoryHelper */
 $directoryHelper = $block->getData('directoryHelper');
+/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
+$regionProvider = $block->getRegionProvider();
 $formData = $block->getFormData();
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
@@ -342,14 +344,14 @@ script;
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php if ($block->getShowAddressFields()): ?>
     <?php
-    $regionJson = /* @noEscape */ $directoryHelper->getRegionJson();
+    $regionJson = /* @noEscape */ $regionProvider->getRegionJson();
     $regionId = (int) $formData->getRegionId();
     $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
     ?>
 <script type="text/x-magento-init">
     {
         "#country": {
-            "regionUpdater": {
+            "directoryRegionUpdater": {
                 "optionalRegionAllowed": <?= /* @noEscape */ $displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
diff --git a/app/code/Magento/Directory/view/frontend/requirejs-config.js b/app/code/Magento/Directory/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..b61358fdba4d8
--- /dev/null
+++ b/app/code/Magento/Directory/view/frontend/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            directoryRegionUpdater:          'Magento_Directory/js/region-updater',
+        }
+    }
+};
diff --git a/app/code/Magento/Directory/view/frontend/web/js/region-updater.js b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
new file mode 100644
index 0000000000000..e5a1fb61cdaa6
--- /dev/null
+++ b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
@@ -0,0 +1,260 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/template',
+    'underscore',
+    'jquery-ui-modules/widget',
+    'mage/validation'
+], function ($, mageTemplate, _) {
+    'use strict';
+
+    $.widget('mage.regionUpdater', {
+        options: {
+            regionTemplate:
+                '<option value="<%- data.value %>" <% if (data.isSelected) { %>selected="selected"<% } %>>' +
+                '<%- data.title %>' +
+                '</option>',
+            isRegionRequired: true,
+            isZipRequired: true,
+            isCountryRequired: true,
+            currentRegion: null,
+            isMultipleCountriesAllowed: true
+        },
+
+        /**
+         *
+         * @private
+         */
+        _create: function () {
+            this._initCountryElement();
+
+            this.currentRegionOption = this.options.currentRegion;
+            this.regionTmpl = mageTemplate(this.options.regionTemplate);
+
+            this._updateRegion(this.element.find('option:selected').val());
+
+            $(this.options.regionListId).on('change', $.proxy(function (e) {
+                this.setOption = false;
+                this.currentRegionOption = $(e.target).val();
+            }, this));
+
+            $(this.options.regionInputId).on('focusout', $.proxy(function () {
+                this.setOption = true;
+            }, this));
+        },
+
+        /**
+         *
+         * @private
+         */
+        _initCountryElement: function () {
+
+            if (this.options.isMultipleCountriesAllowed) {
+                this.element.parents('div.field').show();
+                this.element.on('change', $.proxy(function (e) {
+                    // clear region inputs on country change
+                    $(this.options.regionListId).val('');
+                    $(this.options.regionInputId).val('');
+                    this._updateRegion($(e.target).val());
+                }, this));
+
+                if (this.options.isCountryRequired) {
+                    this.element.addClass('required-entry');
+                    this.element.parents('div.field').addClass('required');
+                }
+            } else {
+                this.element.parents('div.field').hide();
+            }
+        },
+
+        /**
+         * Remove options from dropdown list
+         *
+         * @param {Object} selectElement - jQuery object for dropdown list
+         * @private
+         */
+        _removeSelectOptions: function (selectElement) {
+            selectElement.find('option').each(function (index) {
+                if (index) {
+                    $(this).remove();
+                }
+            });
+        },
+
+        /**
+         * Render dropdown list
+         * @param {Object} selectElement - jQuery object for dropdown list
+         * @param {String} key - region code
+         * @param {Object} value - region object
+         * @private
+         */
+        _renderSelectOption: function (selectElement, key, value) {
+            selectElement.append($.proxy(function () {
+                var name = value.name.replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, '\\$&'),
+                    tmplData,
+                    tmpl;
+
+                if (value.code && $(name).is('span')) {
+                    key = value.code;
+                    value.name = $(name).text();
+                }
+
+                tmplData = {
+                    value: key,
+                    title: value.name,
+                    isSelected: false
+                };
+
+                if (this.options.defaultRegion === key) {
+                    tmplData.isSelected = true;
+                }
+
+                tmpl = this.regionTmpl({
+                    data: tmplData
+                });
+
+                return $(tmpl);
+            }, this));
+        },
+
+        /**
+         * Takes clearError callback function as first option
+         * If no form is passed as option, look up the closest form and call clearError method.
+         * @private
+         */
+        _clearError: function () {
+            var args = ['clearError', this.options.regionListId, this.options.regionInputId, this.options.postcodeId];
+
+            if (this.options.clearError && typeof this.options.clearError === 'function') {
+                this.options.clearError.call(this);
+            } else {
+                if (!this.options.form) {
+                    this.options.form = this.element.closest('form').length ? $(this.element.closest('form')[0]) : null;
+                }
+
+                this.options.form = $(this.options.form);
+
+                this.options.form && this.options.form.data('validator') &&
+                this.options.form.validation.apply(this.options.form, _.compact(args));
+
+                // Clean up errors on region & zip fix
+                $(this.options.regionInputId).removeClass('mage-error').parent().find('[generated]').remove();
+                $(this.options.regionListId).removeClass('mage-error').parent().find('[generated]').remove();
+                $(this.options.postcodeId).removeClass('mage-error').parent().find('[generated]').remove();
+            }
+        },
+
+        /**
+         * Update dropdown list based on the country selected
+         *
+         * @param {String} country - 2 uppercase letter for country code
+         * @private
+         */
+        _updateRegion: function (country) {
+            // Clear validation error messages
+            var regionList = $(this.options.regionListId),
+                regionInput = $(this.options.regionInputId),
+                postcode = $(this.options.postcodeId),
+                label = regionList.parent().siblings('label'),
+                container = regionList.parents('div.field'),
+                regionsEntries,
+                regionId,
+                regionData;
+
+            this._clearError();
+            this._checkRegionRequired(country);
+
+            // Populate state/province dropdown list if available or use input box
+            if (this.options.regionJson[country]) {
+                this._removeSelectOptions(regionList);
+                regionsEntries = _.pairs(this.options.regionJson[country]);
+                $.each(regionsEntries, $.proxy(function (key, value) {
+                    regionData = value[1];
+                    regionId = regionData.id;
+                    this._renderSelectOption(regionList, regionId, regionData);
+                }, this));
+
+                if (this.currentRegionOption) {
+                    regionList.val(this.currentRegionOption);
+                }
+
+                if (this.setOption) {
+                    regionList.find('option').filter(function () {
+                        return this.text === regionInput.val();
+                    }).attr('selected', true);
+                }
+
+                if (this.options.isRegionRequired) {
+                    regionList.addClass('required-entry').removeAttr('disabled');
+                    container.addClass('required').show();
+                } else {
+                    regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
+                    container.removeClass('required');
+
+                    if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
+                        regionList.hide();
+                        container.hide();
+                    } else {
+                        regionList.removeAttr('disabled').show();
+                    }
+                }
+
+                regionList.show();
+                regionInput.hide();
+                label.attr('for', regionList.attr('id'));
+            } else {
+                this._removeSelectOptions(regionList);
+
+                if (this.options.isRegionRequired) {
+                    regionInput.addClass('required-entry').removeAttr('disabled');
+                    container.addClass('required').show();
+                } else {
+                    if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
+                        regionInput.attr('disabled', 'disabled');
+                        container.hide();
+                    }
+                    container.removeClass('required');
+                    regionInput.removeClass('required-entry');
+                }
+
+                regionList.removeClass('required-entry').prop('disabled', 'disabled').hide();
+                regionInput.show();
+                label.attr('for', regionInput.attr('id'));
+            }
+
+            // If country is in optionalzip list, make postcode input not required
+            if (this.options.isZipRequired) {
+                $.inArray(country, this.options.countriesWithOptionalZip) >= 0 ?
+                    postcode.removeClass('required-entry').closest('.field').removeClass('required') :
+                    postcode.addClass('required-entry').closest('.field').addClass('required');
+            }
+
+            // Add defaultvalue attribute to state/province select element
+            regionList.attr('defaultvalue', this.options.defaultRegion);
+            this.options.form.find('[type="submit"]').removeAttr('disabled').show();
+        },
+
+        /**
+         * Check if the selected country has a mandatory region selection
+         *
+         * @param {String} country - Code of the country - 2 uppercase letter for country code
+         * @private
+         */
+        _checkRegionRequired: function (country) {
+            var self = this;
+
+            this.options.isRegionRequired = false;
+            $.each(this.options.regionJson.config['regions_required'], function (index, elem) {
+                if (elem === country) {
+                    self.options.isRegionRequired = true;
+                }
+            });
+        }
+    });
+
+    return $.mage.regionUpdater;
+});

From 5d811c31c44022cddb7ea80f495de8338d314303 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Tue, 1 Jun 2021 16:37:09 +0100
Subject: [PATCH 02/27] github: 32996  Add RegionProvider to be responsible for
 region related directory data

---
 .../ViewModel/Address/RegionProvider.php      | 59 +++--------------
 .../layout/customer_account_create.xml        |  1 -
 .../Directory/Model/RegionProvider.php        | 66 +++++++++++++++++++
 3 files changed, 75 insertions(+), 51 deletions(-)
 create mode 100644 app/code/Magento/Directory/Model/RegionProvider.php

diff --git a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
index 5c7921cd8a244..70f45d5fa091a 100644
--- a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
+++ b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
@@ -1,76 +1,35 @@
 <?php
 /**
- * RegionProvider
- *
- * @copyright Copyright © 2021 Staempfli AG. All rights reserved.
- * @author    juan.alonso@staempfli.com
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Customer\ViewModel\Address;
 
-use Magento\Directory\Helper\Data as DataHelper;
-use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Directory\Model\RegionProvider as DirectoryRegionProvider;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 class RegionProvider implements ArgumentInterface
 {
 
-
-    protected $regions = [];
-
-    /**
-     * @var DataHelper
-     */
-    private $directoryHelper;
     /**
-     * @var JsonSerializer
+     * @var DirectoryRegionProvider
      */
-    private $jsonSerializer;
-
+    private $directoryRegionProvider;
 
     /**
      * Constructor
      *
-     * @param DataHelper $directoryHelper
-     * @param JsonSerializer $jsonSerializer
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param DirectoryRegionProvider $directoryRegionProvider
      */
     public function __construct(
-        DataHelper $directoryHelper,
-        JsonSerializer $jsonSerializer
+        DirectoryRegionProvider $directoryRegionProvider
     ) {
-        $this->directoryHelper= $directoryHelper;
-        $this->jsonSerializer = $jsonSerializer;
+        $this->directoryRegionProvider = $directoryRegionProvider;
     }
 
     public function getRegionJson() : string
     {
-        $regions = $this->getRegions();
-        return $this->jsonSerializer->serialize($regions);
+        return $this->directoryRegionProvider->getRegionJson();
     }
-
-
-    /**
-     * @return array
-     */
-    protected function getRegions() : array
-    {
-        if (!$this->regions) {
-            $regions = $this->directoryHelper->getRegionData();
-            $this->regions['config'] = $regions['config'];
-            unset($regions['config']);
-            foreach ($regions as $countryCode => $countryRegions) {
-                foreach ($countryRegions as $regionId => $regionData) {
-                    $this->regions[$countryCode][] = [
-                        'id'   => $regionId,
-                        'name' => $regionData['name'],
-                        'code' => $regionData['code']
-                    ];
-                }
-            }
-
-        }
-        return $this->regions;
-    }
-
 }
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
index cf16857592431..d48ce316d70e5 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
@@ -18,7 +18,6 @@
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
                     <argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
-                    <argument name="show_address_fields" xsi:type="boolean">true</argument>
                 </arguments>
                 <container name="form.additional.info" as="form_additional_info"/>
                 <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
diff --git a/app/code/Magento/Directory/Model/RegionProvider.php b/app/code/Magento/Directory/Model/RegionProvider.php
new file mode 100644
index 0000000000000..8b4f844163f82
--- /dev/null
+++ b/app/code/Magento/Directory/Model/RegionProvider.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Model;
+
+use Magento\Directory\Helper\Data as DataHelper;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+
+class RegionProvider
+{
+    private $regions;
+    /**
+     * @var DataHelper
+     */
+    private $directoryHelper;
+    /**
+     * @var JsonSerializer
+     */
+    private $jsonSerializer;
+
+    /**
+     * Constructor
+     *
+     * @param DataHelper $directoryHelper
+     * @param JsonSerializer $jsonSerializer
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        DataHelper $directoryHelper,
+        JsonSerializer $jsonSerializer
+    ) {
+        $this->directoryHelper= $directoryHelper;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    public function getRegionJson() : string
+    {
+        $regions = $this->getRegions();
+        return $this->jsonSerializer->serialize($regions);
+    }
+
+    /**
+     * @return array
+     */
+    protected function getRegions() : array
+    {
+        if (!$this->regions) {
+            $regions = $this->directoryHelper->getRegionData();
+            $this->regions['config'] = $regions['config'];
+            unset($regions['config']);
+            foreach ($regions as $countryCode => $countryRegions) {
+                foreach ($countryRegions as $regionId => $regionData) {
+                    $this->regions[$countryCode][] = [
+                        'id'   => $regionId,
+                        'name' => $regionData['name'],
+                        'code' => $regionData['code']
+                    ];
+                }
+            }
+        }
+        return $this->regions;
+    }
+}

From daa0d3e7a896f73689ef5352f52148ed1eba2bcc Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Wed, 2 Jun 2021 14:17:02 +0100
Subject: [PATCH 03/27] github 32996 - code formatting and typecast region id
 to keep it compatible with  previous regionUpdater implementation

---
 app/code/Magento/Customer/ViewModel/Address/RegionProvider.php  | 2 +-
 app/code/Magento/Directory/Model/RegionProvider.php             | 2 +-
 .../Magento/Directory/view/frontend/web/js/region-updater.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
index 70f45d5fa091a..35c1574d526cb 100644
--- a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
+++ b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
@@ -28,7 +28,7 @@ public function __construct(
         $this->directoryRegionProvider = $directoryRegionProvider;
     }
 
-    public function getRegionJson() : string
+    public function getRegionJson(): string
     {
         return $this->directoryRegionProvider->getRegionJson();
     }
diff --git a/app/code/Magento/Directory/Model/RegionProvider.php b/app/code/Magento/Directory/Model/RegionProvider.php
index 8b4f844163f82..976dbc3ae8aa1 100644
--- a/app/code/Magento/Directory/Model/RegionProvider.php
+++ b/app/code/Magento/Directory/Model/RegionProvider.php
@@ -36,7 +36,7 @@ public function __construct(
         $this->jsonSerializer = $jsonSerializer;
     }
 
-    public function getRegionJson() : string
+    public function getRegionJson(): string
     {
         $regions = $this->getRegions();
         return $this->jsonSerializer->serialize($regions);
diff --git a/app/code/Magento/Directory/view/frontend/web/js/region-updater.js b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
index e5a1fb61cdaa6..ef3aaee1fbec1 100644
--- a/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
@@ -175,7 +175,7 @@ define([
                 $.each(regionsEntries, $.proxy(function (key, value) {
                     regionData = value[1];
                     regionId = regionData.id;
-                    this._renderSelectOption(regionList, regionId, regionData);
+                    this._renderSelectOption(regionList, regionId.toString(), regionData);
                 }, this));
 
                 if (this.currentRegionOption) {

From 0366aa3a171b2d19c4b6963f7eb9877a020a159b Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Thu, 3 Jun 2021 13:13:14 +0100
Subject: [PATCH 04/27] github 32996 - fix tests

---
 .../Directory/Model/RegionProvider.php        |  2 +-
 .../view/frontend/requirejs-config.js         |  2 +-
 .../Customer/Block/Form/RegisterTest.php      | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Directory/Model/RegionProvider.php b/app/code/Magento/Directory/Model/RegionProvider.php
index 976dbc3ae8aa1..9e18e0cda7a32 100644
--- a/app/code/Magento/Directory/Model/RegionProvider.php
+++ b/app/code/Magento/Directory/Model/RegionProvider.php
@@ -45,7 +45,7 @@ public function getRegionJson(): string
     /**
      * @return array
      */
-    protected function getRegions() : array
+    private function getRegions() : array
     {
         if (!$this->regions) {
             $regions = $this->directoryHelper->getRegionData();
diff --git a/app/code/Magento/Directory/view/frontend/requirejs-config.js b/app/code/Magento/Directory/view/frontend/requirejs-config.js
index b61358fdba4d8..f7029e785014f 100644
--- a/app/code/Magento/Directory/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Directory/view/frontend/requirejs-config.js
@@ -6,7 +6,7 @@
 var config = {
     map: {
         '*': {
-            directoryRegionUpdater:          'Magento_Directory/js/region-updater',
+            directoryRegionUpdater: 'Magento_Directory/js/region-updater'
         }
     }
 };
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
index 1d06aa7201f64..455458ea589e0 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Block\Form;
 
 use Magento\Customer\Block\DataProviders\AddressAttributeData;
+use Magento\Customer\ViewModel\Address\RegionProvider;
 use Magento\Framework\View\Element\Template;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -28,6 +29,7 @@ public function testCompanyDefault(): void
             ->setTemplate('Magento_Customer::form/register.phtml')
             ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringContainsString('title="Company"', $block->toHtml());
     }
@@ -45,6 +47,7 @@ public function testTelephoneDefault(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringContainsString('title="Phone&#x20;Number"', $block->toHtml());
     }
@@ -62,6 +65,7 @@ public function testFaxDefault(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringNotContainsString('title="Fax"', $block->toHtml());
     }
@@ -86,6 +90,7 @@ public function testCompanyDisabled(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringNotContainsString('title="Company"', $block->toHtml());
     }
@@ -110,6 +115,7 @@ public function testTelephoneDisabled(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringNotContainsString('title="Phone&#x20;Number"', $block->toHtml());
     }
@@ -134,6 +140,7 @@ public function testFaxEnabled(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
         ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringContainsString('title="Fax"', $block->toHtml());
     }
@@ -149,6 +156,7 @@ public function testCityWithStoreLabel(): void
         )->setTemplate('Magento_Customer::form/register.phtml')
             ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
+        $this->setRegionProvider($block);
 
         $this->assertStringNotContainsString('title="City"', $block->toHtml());
         $this->assertStringContainsString('title="Suburb"', $block->toHtml());
@@ -175,4 +183,16 @@ private function setAttributeDataProvider(Template $block): void
         $attributeData = Bootstrap::getObjectManager()->get(AddressAttributeData::class);
         $block->setAttributeData($attributeData);
     }
+
+    /**
+     * Set Region Provider View Model.
+     *
+     * @param Template $block
+     * @return void
+     */
+    private function setRegionProvider(Template $block): void
+    {
+        $regionProvider = Bootstrap::getObjectManager()->create(RegionProvider::class);
+        $block->setRegionProvider($regionProvider);
+    }
 }

From 81de1d7109f5085927862de28e9b675f107591ca Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Fri, 4 Jun 2021 15:40:15 +0100
Subject: [PATCH 05/27] github 32996 - add region provider view model to
 multi-shipping address edit

---
 .../frontend/layout/multishipping_checkout_customer_address.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
index 449f5feeafd9c..34d6aadbe535a 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
@@ -14,6 +14,7 @@
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
                     <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                     <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Address</argument>
+                    <argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
                 </arguments>
             </block>
         </referenceContainer>

From 743838eee6f164fe0c87299ab47cefc35a5f3277 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Fri, 10 Sep 2021 12:25:10 +0100
Subject: [PATCH 06/27] #32996  - fix static tests

---
 .../ViewModel/Address/RegionProvider.php      |   5 +
 .../Directory/Model/RegionProvider.php        |   7 +
 ...dLoopAndPlayWhenVisibleAndLazyLoadCest.php | 372 ++++++++++++++++++
 3 files changed, 384 insertions(+)
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php

diff --git a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
index 35c1574d526cb..194bd3dd0aa36 100644
--- a/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
+++ b/app/code/Magento/Customer/ViewModel/Address/RegionProvider.php
@@ -28,6 +28,11 @@ public function __construct(
         $this->directoryRegionProvider = $directoryRegionProvider;
     }
 
+    /**
+     * Get region data json
+     *
+     * @return string
+     */
     public function getRegionJson(): string
     {
         return $this->directoryRegionProvider->getRegionJson();
diff --git a/app/code/Magento/Directory/Model/RegionProvider.php b/app/code/Magento/Directory/Model/RegionProvider.php
index 9e18e0cda7a32..db9484a5ee3bd 100644
--- a/app/code/Magento/Directory/Model/RegionProvider.php
+++ b/app/code/Magento/Directory/Model/RegionProvider.php
@@ -36,6 +36,11 @@ public function __construct(
         $this->jsonSerializer = $jsonSerializer;
     }
 
+    /**
+     * Get region data json
+     *
+     * @return string
+     */
     public function getRegionJson(): string
     {
         $regions = $this->getRegions();
@@ -43,6 +48,8 @@ public function getRegionJson(): string
     }
 
     /**
+     * Get regions array
+     *
      * @return array
      */
     private function getRegions() : array
diff --git a/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php b/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php
new file mode 100644
index 0000000000000..fd8551f86863b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php
@@ -0,0 +1,372 @@
+<?php
+namespace Magento\AcceptanceTest\_PageBuilderWithWYSIWYG\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ * @Title("MC-31667: Validate Banner with Collage Right Appearance with No Fallback Image, Disabled Infinite Loop, Disabled Play Only When Visible, and Disabled Lazy Load")
+ * @Description("Validate video background with no fallback image, disabled infinite loop, disabled play only when visible, and disabled lazy load.<h3>Test files</h3>magento2-page-builder/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml<br>")
+ * @TestCaseId("MC-31667")
+ * @group pagebuilder
+ * @group pagebuilder-banner
+ * @group pagebuilder-bannerCollageRight
+ * @group pagebuilder-backgroundForm
+ * @group pagebuilder-video-background
+ */
+class BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest
+{
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _before(AcceptanceTester $I)
+	{
+		$I->createEntity("createCMSPage", "hook", "_emptyCmsPage", [], []); // stepKey: createCMSPage
+		$I->comment("Entering Action Group [loginAsAdmin] AdminLoginActionGroup");
+		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/admin"); // stepKey: navigateToAdminLoginAsAdmin
+		$I->fillField("#username", getenv("MAGENTO_ADMIN_USERNAME")); // stepKey: fillUsernameLoginAsAdmin
+		$I->fillField("#login", getenv("MAGENTO_ADMIN_PASSWORD")); // stepKey: fillPasswordLoginAsAdmin
+		$I->click(".actions .action-primary"); // stepKey: clickLoginLoginAsAdmin
+		$I->waitForPageLoad(30); // stepKey: clickLoginLoginAsAdminWaitForPageLoad
+		$I->conditionalClick(".modal-popup .action-secondary", ".modal-popup .action-secondary", true); // stepKey: clickDontAllowButtonIfVisibleLoginAsAdmin
+		$I->closeAdminNotification(); // stepKey: closeAdminNotificationLoginAsAdmin
+		$I->comment("Exiting Action Group [loginAsAdmin] AdminLoginActionGroup");
+		$I->comment("Entering Action Group [navigateToCreatedCMSPage] NavigateToCreatedCMSPageActionGroup");
+		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/cms/page"); // stepKey: navigateToCMSPagesGridNavigateToCreatedCMSPage
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoad1NavigateToCreatedCMSPage
+		$I->conditionalClick("//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]", "//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]", true); // stepKey: clickToResetFilterNavigateToCreatedCMSPage
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoad2NavigateToCreatedCMSPage
+		$I->conditionalClick("//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]", "//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]", true); // stepKey: clickToAttemptSortByIdDescendingNavigateToCreatedCMSPage
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForFirstIdSortDescendingToFinishNavigateToCreatedCMSPage
+		$I->comment("Conditional Click again in case it goes from default state to ascending on first click");
+		$I->conditionalClick("//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]", "//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]", true); // stepKey: secondClickToAttemptSortByIdDescendingNavigateToCreatedCMSPage
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForSecondIdSortDescendingToFinishNavigateToCreatedCMSPage
+		$I->click("//div[text()='" . $I->retrieveEntityField('createCMSPage', 'identifier', 'hook') . "']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']"); // stepKey: clickSelectCreatedCMSPageNavigateToCreatedCMSPage
+		$I->click("//div[text()='" . $I->retrieveEntityField('createCMSPage', 'identifier', 'hook') . "']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']"); // stepKey: navigateToCreatedCMSPageNavigateToCreatedCMSPage
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoad3NavigateToCreatedCMSPage
+		$I->click("div[data-index=content]"); // stepKey: clickExpandContentTabForPageNavigateToCreatedCMSPage
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForLoadingMaskOfStagingSectionNavigateToCreatedCMSPage
+		$I->comment("Exiting Action Group [navigateToCreatedCMSPage] NavigateToCreatedCMSPageActionGroup");
+		$I->comment("Entering Action Group [switchToPageBuilderStage] switchToPageBuilderStage");
+		$I->waitForElementVisible("div[data-index=content]", 30); // stepKey: waitForSectionSwitchToPageBuilderStage
+		$I->conditionalClick("div[data-index=content]", "div[data-index=content]._show", false); // stepKey: expandSectionSwitchToPageBuilderStage
+		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSwitchToPageBuilderStage
+		$I->waitForElementVisible("div.stage-content-snapshot", 30); // stepKey: waitForSnapshotSwitchToPageBuilderStage
+		$I->waitForElementVisible("//button/span[contains(text(), 'Edit with Page Builder')]", 30); // stepKey: waitForEditButtonSwitchToPageBuilderStage
+		$I->click("//button/span[contains(text(), 'Edit with Page Builder')]"); // stepKey: clickEditButtonSwitchToPageBuilderStage
+		$I->waitForPageLoad(30); // stepKey: waitForFullScreenAnimationSwitchToPageBuilderStage
+		$I->waitForElementNotVisible("div.pagebuilder-stage-loading", 30); // stepKey: waitForStageLoadingGraphicNotVisibleSwitchToPageBuilderStage
+		$I->waitForElementVisible("(//div[contains(@class,\"pagebuilder-content-type\") and contains(@class,\"pagebuilder-root-container\")])[1]", 30); // stepKey: waitForPageBuilderRootContainerSwitchToPageBuilderStage
+		$I->comment("removing deprecated element");
+		$I->comment("Exiting Action Group [switchToPageBuilderStage] switchToPageBuilderStage");
+		$I->comment("Entering Action Group [dragRowToRootContainer] dragContentTypeToStage");
+		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//*[text()=\"Row\"]/ancestor::*[contains(@class, \"ui-draggable\")]", 30); // stepKey: waitForContentTypeInPanelDragRowToRootContainer
+		$I->dragAndDrop("//div[contains(@class,'stage-is-active')]//*[text()=\"Row\"]/ancestor::*[contains(@class, \"ui-draggable\")]", "(//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-root-container ')])[1]/descendant::div[contains(@class, \"element-children\")]"); // stepKey: dropContentTypeIntoStageDragRowToRootContainer
+		$I->waitForPageLoad(30); // stepKey: waitForAnimationDragRowToRootContainer
+		$I->dontSeeJsError(); // stepKey: doNotSeeJSErrorInConsoleDragRowToRootContainer
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-row ')]", 10); // stepKey: waitForContentTypeInStageDragRowToRootContainer
+		$I->comment("Exiting Action Group [dragRowToRootContainer] dragContentTypeToStage");
+	}
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		$I->deleteEntity("createCMSPage", "hook"); // stepKey: deleteCMSPage
+		$I->comment("Entering Action Group [logout] AdminLogoutActionGroup");
+		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/admin/auth/logout/"); // stepKey: amOnLogoutPageLogout
+		$I->comment("Exiting Action Group [logout] AdminLogoutActionGroup");
+	}
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _failed(AcceptanceTester $I)
+	{
+		$I->saveScreenshot(); // stepKey: saveScreenshot
+	}
+
+	/**
+	 * @Features({"PageBuilder"})
+	 * @Stories({"Banner"})
+	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad(AcceptanceTester $I)
+	{
+		$I->comment("Entering Action Group [expandPageBuilderPanelMenuSection] expandPageBuilderPanelMenuSection");
+		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//h4[.='Media']", 30); // stepKey: waitForcontentTypeVisibleExpandPageBuilderPanelMenuSection
+		$I->conditionalClick("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//h4[.='Media']", "//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='Media']", false); // stepKey: expandContentTypeMenuSectionExpandPageBuilderPanelMenuSection
+		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='Media']", 30); // stepKey: waitForMenuSectionExpandedExpandPageBuilderPanelMenuSection
+		$I->comment("Exiting Action Group [expandPageBuilderPanelMenuSection] expandPageBuilderPanelMenuSection");
+		$I->comment("Entering Action Group [dragBannerIntoStage] dragContentTypeToStage");
+		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//*[text()=\"Banner\"]/ancestor::*[contains(@class, \"ui-draggable\")]", 30); // stepKey: waitForContentTypeInPanelDragBannerIntoStage
+		$I->dragAndDrop("//div[contains(@class,'stage-is-active')]//*[text()=\"Banner\"]/ancestor::*[contains(@class, \"ui-draggable\")]", "(//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-row ')])[1]/descendant::div[contains(@class, \"element-children\")]"); // stepKey: dropContentTypeIntoStageDragBannerIntoStage
+		$I->waitForPageLoad(30); // stepKey: waitForAnimationDragBannerIntoStage
+		$I->dontSeeJsError(); // stepKey: doNotSeeJSErrorInConsoleDragBannerIntoStage
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageDragBannerIntoStage
+		$I->comment("Exiting Action Group [dragBannerIntoStage] dragContentTypeToStage");
+		$I->comment("Entering Action Group [openEditMenuOnStage] openPageBuilderEditPanel");
+		$I->moveMouseOver("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: moveMouseToSearchPanelOpenEditMenuOnStage
+		$I->waitForPageLoad(30); // stepKey: moveMouseToSearchPanelOpenEditMenuOnStageWaitForPageLoad
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageVisibleOpenEditMenuOnStage
+		$contentTypeLabelSelectorOpenEditMenuOnStage = $I->executeJS("return ['row', 'column'].include('banner') ? '//div[contains(@class, \"pagebuilder-display-label\") and contains(.,\"'+'banner'.toUpperCase()+'\")]' : ['tabs'].include('banner') ? '//ul[@data-element=\"navigation\"]' : '';"); // stepKey: contentTypeLabelSelectorOpenEditMenuOnStage
+		$contentTypeSelectorOpenEditMenuOnStage = $I->executeJS("return ['row'].include('banner') ? '//div[contains(@class, \"pagebuilder-content-type-affordance\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-affordance-banner \")]' : '//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-banner \")]';"); // stepKey: contentTypeSelectorOpenEditMenuOnStage
+		$I->moveMouseOver("{$contentTypeSelectorOpenEditMenuOnStage}{$contentTypeLabelSelectorOpenEditMenuOnStage}", 10, 0); // stepKey: onMouseOverContentTypeStageOpenEditMenuOnStage
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadOpenEditMenuOnStage
+		$I->waitForElementVisible("(//div[contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]//div[contains(@class, \"pagebuilder-options\")])[1]", 10); // stepKey: waitForOptionsOpenEditMenuOnStage
+		$I->click("div.pagebuilder-content-type.pagebuilder-banner div.pagebuilder-options li.pagebuilder-options-link a.edit-content-type"); // stepKey: clickEditContentTypeOpenEditMenuOnStage
+		$I->waitForPageLoad(30); // stepKey: waitForEditFormToLoadOpenEditMenuOnStage
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 30); // stepKey: waitForEditFormOpenEditMenuOnStage
+		$I->see("Edit Banner", "aside._show .modal-title[data-role='title']"); // stepKey: seeContentTypeNameInEditFormTitleOpenEditMenuOnStage
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForAnimation2OpenEditMenuOnStage
+		$I->comment("Exiting Action Group [openEditMenuOnStage] openPageBuilderEditPanel");
+		$I->comment("Entering Action Group [setAppearance] chooseVisualSelectOption");
+		$I->waitForElement("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"appearance\"]", 2); // stepKey: waitForElementVisibleSetAppearance
+		$I->seeElement("//li[@name=\"collage-right\"]"); // stepKey: seeVisualSelectSetAppearance
+		$I->click("//div[@data-index=\"appearance_fieldset\"]//li[@name=\"collage-right\"]"); // stepKey: chooseVisualSelectOptionSetAppearance
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSetAppearance
+		$I->comment("Exiting Action Group [setAppearance] chooseVisualSelectOption");
+		$I->comment("Entering Action Group [enterMinHeightProperty] fillSlideOutPanelFieldGeneral");
+		$I->comment("This action group does not assert against the section changed icon since this doesn't exist for General sections");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadEnterMinHeightProperty
+		$I->waitForElement("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"min_height\"]", 2); // stepKey: waitForElementVisibleEnterMinHeightProperty
+		$I->see("Minimum Height", "//aside//div[@data-index=\"appearance_fieldset\"]/descendant::div[@data-index=\"min_height\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Minimum Height\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelEnterMinHeightProperty
+		$I->fillField("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"min_height\"]", "300px"); // stepKey: fillPropertyFieldEnterMinHeightProperty
+		$I->click("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::div[@data-index=\"min_height\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Minimum Height\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelEnterMinHeightProperty
+		$I->comment("Exiting Action Group [enterMinHeightProperty] fillSlideOutPanelFieldGeneral");
+		$I->comment("Set Edit Panel");
+		$I->comment("Entering Action Group [setBackgroundType] chooseVisualSelectOption");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_type\"]", 2); // stepKey: waitForElementVisibleSetBackgroundType
+		$I->seeElement("//li[@name=\"video\"]"); // stepKey: seeVisualSelectSetBackgroundType
+		$I->click("//div[@data-index=\"background\"]//li[@name=\"video\"]"); // stepKey: chooseVisualSelectOptionSetBackgroundType
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSetBackgroundType
+		$I->comment("Exiting Action Group [setBackgroundType] chooseVisualSelectOption");
+		$I->comment("Entering Action Group [enterVideoUrlValid] fillSlideOutPanelFieldGeneral");
+		$I->comment("This action group does not assert against the section changed icon since this doesn't exist for General sections");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadEnterVideoUrlValid
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", 2); // stepKey: waitForElementVisibleEnterVideoUrlValid
+		$I->see("Video URL", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelEnterVideoUrlValid
+		$I->fillField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", "https://www.youtube.com/embed/slOtnjsbff0"); // stepKey: fillPropertyFieldEnterVideoUrlValid
+		$I->click("//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelEnterVideoUrlValid
+		$I->comment("Exiting Action Group [enterVideoUrlValid] fillSlideOutPanelFieldGeneral");
+		$I->comment("Entering Action Group [disableInfiniteLoop] conditionalClickSlideOutPanelFieldGeneral");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]", 2); // stepKey: waitForElementVisibleDisableInfiniteLoop
+		$I->conditionalClick("//*[@name='video_loop']/parent::*/label", "//input[@type='checkbox' and @name='video_loop' and @value='false']", false); // stepKey: conditionalClickAttributeDisableInfiniteLoop
+		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_loop' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisableInfiniteLoop
+		$I->comment("Exiting Action Group [disableInfiniteLoop] conditionalClickSlideOutPanelFieldGeneral");
+		$I->comment("Entering Action Group [disableLazyLoad] conditionalClickSlideOutPanelFieldGeneral");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]", 2); // stepKey: waitForElementVisibleDisableLazyLoad
+		$I->conditionalClick("//*[@name='video_lazy_load']/parent::*/label", "//input[@type='checkbox' and @name='video_lazy_load' and @value='false']", false); // stepKey: conditionalClickAttributeDisableLazyLoad
+		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_lazy_load' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisableLazyLoad
+		$I->comment("Exiting Action Group [disableLazyLoad] conditionalClickSlideOutPanelFieldGeneral");
+		$I->comment("Entering Action Group [disablePlayOnlyWhenVisible] conditionalClickSlideOutPanelFieldGeneral");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]", 2); // stepKey: waitForElementVisibleDisablePlayOnlyWhenVisible
+		$I->conditionalClick("//*[@name='video_play_only_visible']/parent::*/label", "//input[@type='checkbox' and @name='video_play_only_visible' and @value='false']", false); // stepKey: conditionalClickAttributeDisablePlayOnlyWhenVisible
+		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_play_only_visible' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisablePlayOnlyWhenVisible
+		$I->comment("Exiting Action Group [disablePlayOnlyWhenVisible] conditionalClickSlideOutPanelFieldGeneral");
+		$I->comment("Entering Action Group [selectShowButton] selectSlideOutPanelField");
+		$I->waitForElementVisible("//aside//div[@data-index=\"contents\"]/descendant::*[@name=\"show_button\"]", 2); // stepKey: waitForElementVisibleSelectShowButton
+		$I->selectOption("//aside//div[@data-index=\"contents\"]/descendant::*[@name=\"show_button\"]", "always"); // stepKey: selectPropertyFieldSelectShowButton
+		$I->click("//aside//div[@data-index=\"contents\"]/descendant::div[@data-index=\"show_button\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"contents\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Show Button\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelSelectShowButton
+		$I->waitForElementVisible("[data-index='contents'] ._changed .admin__page-nav-item-message-icon", 2); // stepKey: waitForSectionChangedIconSelectShowButton
+		$I->comment("Exiting Action Group [selectShowButton] selectSlideOutPanelField");
+		$I->comment("Entering Action Group [saveEditPanelSettings] saveEditPanelSettings");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSaveEditPanelSettings
+		$I->waitForElementVisible(".modal-header .page-main-actions [data-form-role='save']", 5); // stepKey: waitForSaveButtonSaveEditPanelSettings
+		$I->waitForPageLoad(30); // stepKey: waitForSaveButtonSaveEditPanelSettingsWaitForPageLoad
+		$I->click(".modal-header .page-main-actions [data-form-role='save']"); // stepKey: clickSaveButtonSaveEditPanelSettings
+		$I->waitForPageLoad(30); // stepKey: clickSaveButtonSaveEditPanelSettingsWaitForPageLoad
+		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSaveEditPanelSettings
+		$I->waitForElementNotVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 5); // stepKey: waitForEditFormNotVisibleSaveEditPanelSettings
+		$I->waitForElementVisible("#save-button", 10); // stepKey: waitForCmsPageSaveButtonSaveEditPanelSettings
+		$I->waitForPageLoad(10); // stepKey: waitForCmsPageSaveButtonSaveEditPanelSettingsWaitForPageLoad
+		$I->comment("Exiting Action Group [saveEditPanelSettings] saveEditPanelSettings");
+		$I->comment("Validate Stage");
+		$I->comment("Entering Action Group [validateStage1] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStage1
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStage1
+		$grabBackgroundColorValueValidateStage1 = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[contains(@class,\"pagebuilder-banner\") and @data-element=\"main\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStage1
+		$I->assertEquals("rgb(250, 250, 250)", $grabBackgroundColorValueValidateStage1); // stepKey: dontSeeBackgroundColorInDOMValidateStage1
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStage1
+		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStage1
+		$jarallaxStyleValidateStage1 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStage1
+		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStage1); // stepKey: assertHeightValidateStage1
+		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStage1); // stepKey: assertWidthValidateStage1
+		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStage1); // stepKey: assertOverflowHiddenValidateStage1
+		$videoStyleValidateStage1 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStage1
+		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStage1); // stepKey: assertVideoPositionValidateStage1
+		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStage1); // stepKey: assertVideoPlayingValidateStage1
+		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStage1
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStage1
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStage1
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStage1
+		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStage1
+		$I->dontSeeElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStage1
+		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStage1
+		$I->comment("Exiting Action Group [validateStage1] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->comment("Entering Action Group [inlineEdit] inlineEditWYSIWYGFromStage");
+		$I->click("(//div[@data-content-type='banner'])[1]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='banner' and contains(@class,'inline-wysiwyg')])[1]"); // stepKey: focusOnEditorAreaInlineEdit
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='banner'])[1][following-sibling::div[contains(@class,'tox-tinymce-inline')]]", 30); // stepKey: waitForEditorPanelInlineEdit
+		$I->pressKey("(//div[@data-content-type='banner'])[1]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='banner' and contains(@class,'inline-wysiwyg')])[1]", "Good Night!"); // stepKey: enterContentIntoEditorInlineEdit
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadInlineEdit
+		$I->click("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: loseFocusFromEditorInlineEdit
+		$I->waitForPageLoad(30); // stepKey: loseFocusFromEditorInlineEditWaitForPageLoad
+		$I->comment("Exiting Action Group [inlineEdit] inlineEditWYSIWYGFromStage");
+		$I->comment("Entering Action Group [inlineEditBannerButton] inlineEditSlideOrBannerButton");
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']", 30); // stepKey: waitForButtonVisibleInlineEditBannerButton
+		$I->click("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']"); // stepKey: clickButtonToEditInlineEditBannerButton
+		$I->pressKey("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']", "Good Morning!"); // stepKey: enterButtonTextInlineEditBannerButton
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: seeButtonTextInlineEditBannerButton
+		$I->click("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: unFocusLiveEditInlineEditBannerButton
+		$I->waitForPageLoad(30); // stepKey: unFocusLiveEditInlineEditBannerButtonWaitForPageLoad
+		$I->waitForPageLoad(30); // stepKey: waitForUnFocusInlineEditBannerButton
+		$I->comment("Exiting Action Group [inlineEditBannerButton] inlineEditSlideOrBannerButton");
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStage
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: waitForButtonTextStage
+		$I->comment("Entering Action Group [exitPageBuilderFullScreen] exitPageBuilderFullScreen");
+		$I->waitForElementVisible(".pagebuilder-header .icon-pagebuilder-fullscreen-exit", 30); // stepKey: waitForExitPageBuilderFullScreenButtonExitPageBuilderFullScreen
+		$I->click(".pagebuilder-header .icon-pagebuilder-fullscreen-exit"); // stepKey: exitPageBuilderFullScreenExitPageBuilderFullScreen
+		$I->waitForPageLoad(30); // stepKey: waitForExitFullScreenExitPageBuilderFullScreen
+		$I->dontSeeElementInDOM(".pagebuilder-header .icon-pagebuilder-fullscreen-exit"); // stepKey: dontSeeExitPageBuilderFullScreenButtonExitPageBuilderFullScreen
+		$I->comment("Exiting Action Group [exitPageBuilderFullScreen] exitPageBuilderFullScreen");
+		$I->comment("Entering Action Group [saveAndContinueEditCmsPage] SaveAndContinueEditCmsPageActionGroup");
+		$I->waitForElementVisible("#save-button", 10); // stepKey: waitForSaveAndContinueVisibilitySaveAndContinueEditCmsPage
+		$I->waitForPageLoad(10); // stepKey: waitForSaveAndContinueVisibilitySaveAndContinueEditCmsPageWaitForPageLoad
+		$I->click("#save-button"); // stepKey: clickSaveAndContinueEditCmsPageSaveAndContinueEditCmsPage
+		$I->waitForPageLoad(10); // stepKey: clickSaveAndContinueEditCmsPageSaveAndContinueEditCmsPageWaitForPageLoad
+		$I->waitForPageLoad(30); // stepKey: waitForCmsPageLoadSaveAndContinueEditCmsPage
+		$I->waitForElementVisible(".page-header .page-title", 1); // stepKey: waitForCmsPageSaveButtonSaveAndContinueEditCmsPage
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForLoadingMaskSaveAndContinueEditCmsPage
+		$I->comment("Exiting Action Group [saveAndContinueEditCmsPage] SaveAndContinueEditCmsPageActionGroup");
+		$I->comment("Entering Action Group [switchToPageBuilderStage2] switchToPageBuilderStage");
+		$I->waitForElementVisible("div[data-index=content]", 30); // stepKey: waitForSectionSwitchToPageBuilderStage2
+		$I->conditionalClick("div[data-index=content]", "div[data-index=content]._show", false); // stepKey: expandSectionSwitchToPageBuilderStage2
+		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSwitchToPageBuilderStage2
+		$I->waitForElementVisible("div.stage-content-snapshot", 30); // stepKey: waitForSnapshotSwitchToPageBuilderStage2
+		$I->waitForElementVisible("//button/span[contains(text(), 'Edit with Page Builder')]", 30); // stepKey: waitForEditButtonSwitchToPageBuilderStage2
+		$I->click("//button/span[contains(text(), 'Edit with Page Builder')]"); // stepKey: clickEditButtonSwitchToPageBuilderStage2
+		$I->waitForPageLoad(30); // stepKey: waitForFullScreenAnimationSwitchToPageBuilderStage2
+		$I->waitForElementNotVisible("div.pagebuilder-stage-loading", 30); // stepKey: waitForStageLoadingGraphicNotVisibleSwitchToPageBuilderStage2
+		$I->waitForElementVisible("(//div[contains(@class,\"pagebuilder-content-type\") and contains(@class,\"pagebuilder-root-container\")])[1]", 30); // stepKey: waitForPageBuilderRootContainerSwitchToPageBuilderStage2
+		$I->comment("removing deprecated element");
+		$I->comment("Exiting Action Group [switchToPageBuilderStage2] switchToPageBuilderStage");
+		$I->comment("Validate Stage After Save");
+		$I->scrollTo("div[data-index=content]"); // stepKey: scrollBanner1Stage
+		$I->comment("Entering Action Group [validateStage2] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStage2
+		$grabBackgroundColorValueValidateStage2 = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[contains(@class,\"pagebuilder-banner\") and @data-element=\"main\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStage2
+		$I->assertEquals("rgb(250, 250, 250)", $grabBackgroundColorValueValidateStage2); // stepKey: dontSeeBackgroundColorInDOMValidateStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStage2
+		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStage2
+		$jarallaxStyleValidateStage2 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStage2
+		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStage2); // stepKey: assertHeightValidateStage2
+		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStage2); // stepKey: assertWidthValidateStage2
+		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStage2); // stepKey: assertOverflowHiddenValidateStage2
+		$videoStyleValidateStage2 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStage2
+		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStage2); // stepKey: assertVideoPositionValidateStage2
+		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStage2); // stepKey: assertVideoPlayingValidateStage2
+		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStage2
+		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStage2
+		$I->dontSeeElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStage2
+		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStage2
+		$I->comment("Exiting Action Group [validateStage2] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStage2
+		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: waitForButtonTextStage2
+		$I->comment("Validate Edit Panel After Save");
+		$I->comment("Entering Action Group [openEditPanelAfterSave] openPageBuilderEditPanel");
+		$I->moveMouseOver("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: moveMouseToSearchPanelOpenEditPanelAfterSave
+		$I->waitForPageLoad(30); // stepKey: moveMouseToSearchPanelOpenEditPanelAfterSaveWaitForPageLoad
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageVisibleOpenEditPanelAfterSave
+		$contentTypeLabelSelectorOpenEditPanelAfterSave = $I->executeJS("return ['row', 'column'].include('banner') ? '//div[contains(@class, \"pagebuilder-display-label\") and contains(.,\"'+'banner'.toUpperCase()+'\")]' : ['tabs'].include('banner') ? '//ul[@data-element=\"navigation\"]' : '';"); // stepKey: contentTypeLabelSelectorOpenEditPanelAfterSave
+		$contentTypeSelectorOpenEditPanelAfterSave = $I->executeJS("return ['row'].include('banner') ? '//div[contains(@class, \"pagebuilder-content-type-affordance\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-affordance-banner \")]' : '//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-banner \")]';"); // stepKey: contentTypeSelectorOpenEditPanelAfterSave
+		$I->moveMouseOver("{$contentTypeSelectorOpenEditPanelAfterSave}{$contentTypeLabelSelectorOpenEditPanelAfterSave}", null, null); // stepKey: onMouseOverContentTypeStageOpenEditPanelAfterSave
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadOpenEditPanelAfterSave
+		$I->waitForElementVisible("(//div[contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]//div[contains(@class, \"pagebuilder-options\")])[1]", 10); // stepKey: waitForOptionsOpenEditPanelAfterSave
+		$I->click("div.pagebuilder-content-type.pagebuilder-banner div.pagebuilder-options li.pagebuilder-options-link a.edit-content-type"); // stepKey: clickEditContentTypeOpenEditPanelAfterSave
+		$I->waitForPageLoad(30); // stepKey: waitForEditFormToLoadOpenEditPanelAfterSave
+		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 30); // stepKey: waitForEditFormOpenEditPanelAfterSave
+		$I->see("Edit Banner", "aside._show .modal-title[data-role='title']"); // stepKey: seeContentTypeNameInEditFormTitleOpenEditPanelAfterSave
+		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForAnimation2OpenEditPanelAfterSave
+		$I->comment("Exiting Action Group [openEditPanelAfterSave] openPageBuilderEditPanel");
+		$I->comment("Entering Action Group [validateBackgroundColorEmptyAfterSave] seeInFieldSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_color\"]", 2); // stepKey: waitForElementVisibleValidateBackgroundColorEmptyAfterSave
+		$I->see("Background Color", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"background_color\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Background Color\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateBackgroundColorEmptyAfterSave
+		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_color\"]", ""); // stepKey: seeInFieldPropertyValidateBackgroundColorEmptyAfterSave
+		$I->comment("Exiting Action Group [validateBackgroundColorEmptyAfterSave] seeInFieldSlideOutProperty");
+		$I->comment("Entering Action Group [validateVideoUrlAfterSave] seeInFieldSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", 2); // stepKey: waitForElementVisibleValidateVideoUrlAfterSave
+		$I->see("Video URL", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateVideoUrlAfterSave
+		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", "https://www.youtube.com/embed/slOtnjsbff0"); // stepKey: seeInFieldPropertyValidateVideoUrlAfterSave
+		$I->comment("Exiting Action Group [validateVideoUrlAfterSave] seeInFieldSlideOutProperty");
+		$I->comment("Entering Action Group [validateOverlayColorEmptyAfterSave] seeInFieldSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_overlay_color\"]", 2); // stepKey: waitForElementVisibleValidateOverlayColorEmptyAfterSave
+		$I->see("Overlay Color", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_overlay_color\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Overlay Color\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateOverlayColorEmptyAfterSave
+		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_overlay_color\"]", ""); // stepKey: seeInFieldPropertyValidateOverlayColorEmptyAfterSave
+		$I->comment("Exiting Action Group [validateOverlayColorEmptyAfterSave] seeInFieldSlideOutProperty");
+		$I->comment("Entering Action Group [validateInfiniteLoopAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]", 2); // stepKey: waitForElementVisibleValidateInfiniteLoopAfterSave
+		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidateInfiniteLoopAfterSave
+		$I->comment("Exiting Action Group [validateInfiniteLoopAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->comment("Entering Action Group [validateLazyLoadAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]", 2); // stepKey: waitForElementVisibleValidateLazyLoadAfterSave
+		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidateLazyLoadAfterSave
+		$I->comment("Exiting Action Group [validateLazyLoadAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->comment("Entering Action Group [validatePlayOnlyWhenVisibleAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]", 2); // stepKey: waitForElementVisibleValidatePlayOnlyWhenVisibleAfterSave
+		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidatePlayOnlyWhenVisibleAfterSave
+		$I->comment("Exiting Action Group [validatePlayOnlyWhenVisibleAfterSave] seeOptionIsNotCheckedSlideOutProperty");
+		$I->comment("Entering Action Group [validateNoFallbackImageAfterSave] seeNoImageUploadedOnSlideOut");
+		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_fallback_image\"]", 30); // stepKey: waitForElementValidateNoFallbackImageAfterSave
+		$I->waitForElementVisible("//span[text()='Fallback Image']//parent::label//following-sibling::div//p[text()='Browse to find or drag image here']", 30); // stepKey: seeNoUploadedFileValidateNoFallbackImageAfterSave
+		$I->comment("Exiting Action Group [validateNoFallbackImageAfterSave] seeNoImageUploadedOnSlideOut");
+		$I->comment("Validate Storefront");
+		$I->comment("Entering Action Group [navigateToStorefront] NavigateToStorefrontForCreatedPageActionGroup");
+		$I->amOnPage($I->retrieveEntityField('createCMSPage', 'identifier', 'test')); // stepKey: goToStorefrontNavigateToStorefront
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadNavigateToStorefront
+		$I->comment("Exiting Action Group [navigateToStorefront] NavigateToStorefrontForCreatedPageActionGroup");
+		$I->comment("Entering Action Group [validateStorefront] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStorefront
+		$grabBackgroundColorValueValidateStorefront = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[@data-content-type=\"banner\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStorefront
+		$I->assertEquals("rgba(0, 0, 0, 0)", $grabBackgroundColorValueValidateStorefront); // stepKey: dontSeeBackgroundColorInDOMValidateStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStorefront
+		$I->waitForElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStorefront
+		$jarallaxStyleValidateStorefront = $I->grabAttributeFrom("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStorefront
+		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStorefront); // stepKey: assertHeightValidateStorefront
+		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStorefront); // stepKey: assertWidthValidateStorefront
+		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStorefront); // stepKey: assertOverflowHiddenValidateStorefront
+		$videoStyleValidateStorefront = $I->grabAttributeFrom("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStorefront
+		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStorefront); // stepKey: assertVideoPositionValidateStorefront
+		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStorefront); // stepKey: assertVideoPlayingValidateStorefront
+		$I->dontSeeElementInDOM("(//div[@data-content-type='banner'])[1]//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStorefront
+		$I->waitForElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStorefront
+		$I->dontSeeElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStorefront
+		$I->dontSeeElementInDOM("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStorefront
+		$I->comment("Exiting Action Group [validateStorefront] validateVideoBackgroundWithOnlyVideoUrl");
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStorefront
+		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper']//button[.='Good Morning!']", 30); // stepKey: waitForButtonTextStorefront
+	}
+}

From f3fd93e3742691bd5b509b6d3dfe964ab069f226 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Fri, 10 Sep 2021 13:21:17 +0100
Subject: [PATCH 07/27] #32996 delete file

---
 ...dLoopAndPlayWhenVisibleAndLazyLoadCest.php | 372 ------------------
 1 file changed, 372 deletions(-)
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php

diff --git a/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php b/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php
deleted file mode 100644
index fd8551f86863b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/_generated/PageBuilderWithWYSIWYG/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-namespace Magento\AcceptanceTest\_PageBuilderWithWYSIWYG\Backend;
-
-use Magento\FunctionalTestingFramework\AcceptanceTester;
-use \Codeception\Util\Locator;
-use Yandex\Allure\Adapter\Annotation\Features;
-use Yandex\Allure\Adapter\Annotation\Stories;
-use Yandex\Allure\Adapter\Annotation\Title;
-use Yandex\Allure\Adapter\Annotation\Description;
-use Yandex\Allure\Adapter\Annotation\Parameter;
-use Yandex\Allure\Adapter\Annotation\Severity;
-use Yandex\Allure\Adapter\Model\SeverityLevel;
-use Yandex\Allure\Adapter\Annotation\TestCaseId;
-
-/**
- * @Title("MC-31667: Validate Banner with Collage Right Appearance with No Fallback Image, Disabled Infinite Loop, Disabled Play Only When Visible, and Disabled Lazy Load")
- * @Description("Validate video background with no fallback image, disabled infinite loop, disabled play only when visible, and disabled lazy load.<h3>Test files</h3>magento2-page-builder/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml<br>")
- * @TestCaseId("MC-31667")
- * @group pagebuilder
- * @group pagebuilder-banner
- * @group pagebuilder-bannerCollageRight
- * @group pagebuilder-backgroundForm
- * @group pagebuilder-video-background
- */
-class BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoadCest
-{
-	/**
-	  * @param AcceptanceTester $I
-	  * @throws \Exception
-	  */
-	public function _before(AcceptanceTester $I)
-	{
-		$I->createEntity("createCMSPage", "hook", "_emptyCmsPage", [], []); // stepKey: createCMSPage
-		$I->comment("Entering Action Group [loginAsAdmin] AdminLoginActionGroup");
-		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/admin"); // stepKey: navigateToAdminLoginAsAdmin
-		$I->fillField("#username", getenv("MAGENTO_ADMIN_USERNAME")); // stepKey: fillUsernameLoginAsAdmin
-		$I->fillField("#login", getenv("MAGENTO_ADMIN_PASSWORD")); // stepKey: fillPasswordLoginAsAdmin
-		$I->click(".actions .action-primary"); // stepKey: clickLoginLoginAsAdmin
-		$I->waitForPageLoad(30); // stepKey: clickLoginLoginAsAdminWaitForPageLoad
-		$I->conditionalClick(".modal-popup .action-secondary", ".modal-popup .action-secondary", true); // stepKey: clickDontAllowButtonIfVisibleLoginAsAdmin
-		$I->closeAdminNotification(); // stepKey: closeAdminNotificationLoginAsAdmin
-		$I->comment("Exiting Action Group [loginAsAdmin] AdminLoginActionGroup");
-		$I->comment("Entering Action Group [navigateToCreatedCMSPage] NavigateToCreatedCMSPageActionGroup");
-		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/cms/page"); // stepKey: navigateToCMSPagesGridNavigateToCreatedCMSPage
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoad1NavigateToCreatedCMSPage
-		$I->conditionalClick("//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]", "//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]", true); // stepKey: clickToResetFilterNavigateToCreatedCMSPage
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoad2NavigateToCreatedCMSPage
-		$I->conditionalClick("//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]", "//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]", true); // stepKey: clickToAttemptSortByIdDescendingNavigateToCreatedCMSPage
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForFirstIdSortDescendingToFinishNavigateToCreatedCMSPage
-		$I->comment("Conditional Click again in case it goes from default state to ascending on first click");
-		$I->conditionalClick("//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]", "//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]", true); // stepKey: secondClickToAttemptSortByIdDescendingNavigateToCreatedCMSPage
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForSecondIdSortDescendingToFinishNavigateToCreatedCMSPage
-		$I->click("//div[text()='" . $I->retrieveEntityField('createCMSPage', 'identifier', 'hook') . "']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']"); // stepKey: clickSelectCreatedCMSPageNavigateToCreatedCMSPage
-		$I->click("//div[text()='" . $I->retrieveEntityField('createCMSPage', 'identifier', 'hook') . "']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']"); // stepKey: navigateToCreatedCMSPageNavigateToCreatedCMSPage
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoad3NavigateToCreatedCMSPage
-		$I->click("div[data-index=content]"); // stepKey: clickExpandContentTabForPageNavigateToCreatedCMSPage
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForLoadingMaskOfStagingSectionNavigateToCreatedCMSPage
-		$I->comment("Exiting Action Group [navigateToCreatedCMSPage] NavigateToCreatedCMSPageActionGroup");
-		$I->comment("Entering Action Group [switchToPageBuilderStage] switchToPageBuilderStage");
-		$I->waitForElementVisible("div[data-index=content]", 30); // stepKey: waitForSectionSwitchToPageBuilderStage
-		$I->conditionalClick("div[data-index=content]", "div[data-index=content]._show", false); // stepKey: expandSectionSwitchToPageBuilderStage
-		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSwitchToPageBuilderStage
-		$I->waitForElementVisible("div.stage-content-snapshot", 30); // stepKey: waitForSnapshotSwitchToPageBuilderStage
-		$I->waitForElementVisible("//button/span[contains(text(), 'Edit with Page Builder')]", 30); // stepKey: waitForEditButtonSwitchToPageBuilderStage
-		$I->click("//button/span[contains(text(), 'Edit with Page Builder')]"); // stepKey: clickEditButtonSwitchToPageBuilderStage
-		$I->waitForPageLoad(30); // stepKey: waitForFullScreenAnimationSwitchToPageBuilderStage
-		$I->waitForElementNotVisible("div.pagebuilder-stage-loading", 30); // stepKey: waitForStageLoadingGraphicNotVisibleSwitchToPageBuilderStage
-		$I->waitForElementVisible("(//div[contains(@class,\"pagebuilder-content-type\") and contains(@class,\"pagebuilder-root-container\")])[1]", 30); // stepKey: waitForPageBuilderRootContainerSwitchToPageBuilderStage
-		$I->comment("removing deprecated element");
-		$I->comment("Exiting Action Group [switchToPageBuilderStage] switchToPageBuilderStage");
-		$I->comment("Entering Action Group [dragRowToRootContainer] dragContentTypeToStage");
-		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//*[text()=\"Row\"]/ancestor::*[contains(@class, \"ui-draggable\")]", 30); // stepKey: waitForContentTypeInPanelDragRowToRootContainer
-		$I->dragAndDrop("//div[contains(@class,'stage-is-active')]//*[text()=\"Row\"]/ancestor::*[contains(@class, \"ui-draggable\")]", "(//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-root-container ')])[1]/descendant::div[contains(@class, \"element-children\")]"); // stepKey: dropContentTypeIntoStageDragRowToRootContainer
-		$I->waitForPageLoad(30); // stepKey: waitForAnimationDragRowToRootContainer
-		$I->dontSeeJsError(); // stepKey: doNotSeeJSErrorInConsoleDragRowToRootContainer
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-row ')]", 10); // stepKey: waitForContentTypeInStageDragRowToRootContainer
-		$I->comment("Exiting Action Group [dragRowToRootContainer] dragContentTypeToStage");
-	}
-
-	/**
-	  * @param AcceptanceTester $I
-	  * @throws \Exception
-	  */
-	public function _after(AcceptanceTester $I)
-	{
-		$I->deleteEntity("createCMSPage", "hook"); // stepKey: deleteCMSPage
-		$I->comment("Entering Action Group [logout] AdminLogoutActionGroup");
-		$I->amOnPage((getenv("MAGENTO_BACKEND_BASE_URL") ? rtrim(getenv("MAGENTO_BACKEND_BASE_URL"), "/") : "") . "/" . getenv("MAGENTO_BACKEND_NAME") . "/admin/auth/logout/"); // stepKey: amOnLogoutPageLogout
-		$I->comment("Exiting Action Group [logout] AdminLogoutActionGroup");
-	}
-
-	/**
-	  * @param AcceptanceTester $I
-	  * @throws \Exception
-	  */
-	public function _failed(AcceptanceTester $I)
-	{
-		$I->saveScreenshot(); // stepKey: saveScreenshot
-	}
-
-	/**
-	 * @Features({"PageBuilder"})
-	 * @Stories({"Banner"})
-	 * @Severity(level = SeverityLevel::BLOCKER)
-	 * @Parameter(name = "AcceptanceTester", value="$I")
-	 * @param AcceptanceTester $I
-	 * @return void
-	 * @throws \Exception
-	 */
-	public function BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad(AcceptanceTester $I)
-	{
-		$I->comment("Entering Action Group [expandPageBuilderPanelMenuSection] expandPageBuilderPanelMenuSection");
-		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//h4[.='Media']", 30); // stepKey: waitForcontentTypeVisibleExpandPageBuilderPanelMenuSection
-		$I->conditionalClick("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//h4[.='Media']", "//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='Media']", false); // stepKey: expandContentTypeMenuSectionExpandPageBuilderPanelMenuSection
-		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='Media']", 30); // stepKey: waitForMenuSectionExpandedExpandPageBuilderPanelMenuSection
-		$I->comment("Exiting Action Group [expandPageBuilderPanelMenuSection] expandPageBuilderPanelMenuSection");
-		$I->comment("Entering Action Group [dragBannerIntoStage] dragContentTypeToStage");
-		$I->waitForElementVisible("//div[contains(@class,'stage-is-active')]//*[text()=\"Banner\"]/ancestor::*[contains(@class, \"ui-draggable\")]", 30); // stepKey: waitForContentTypeInPanelDragBannerIntoStage
-		$I->dragAndDrop("//div[contains(@class,'stage-is-active')]//*[text()=\"Banner\"]/ancestor::*[contains(@class, \"ui-draggable\")]", "(//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-row ')])[1]/descendant::div[contains(@class, \"element-children\")]"); // stepKey: dropContentTypeIntoStageDragBannerIntoStage
-		$I->waitForPageLoad(30); // stepKey: waitForAnimationDragBannerIntoStage
-		$I->dontSeeJsError(); // stepKey: doNotSeeJSErrorInConsoleDragBannerIntoStage
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageDragBannerIntoStage
-		$I->comment("Exiting Action Group [dragBannerIntoStage] dragContentTypeToStage");
-		$I->comment("Entering Action Group [openEditMenuOnStage] openPageBuilderEditPanel");
-		$I->moveMouseOver("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: moveMouseToSearchPanelOpenEditMenuOnStage
-		$I->waitForPageLoad(30); // stepKey: moveMouseToSearchPanelOpenEditMenuOnStageWaitForPageLoad
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageVisibleOpenEditMenuOnStage
-		$contentTypeLabelSelectorOpenEditMenuOnStage = $I->executeJS("return ['row', 'column'].include('banner') ? '//div[contains(@class, \"pagebuilder-display-label\") and contains(.,\"'+'banner'.toUpperCase()+'\")]' : ['tabs'].include('banner') ? '//ul[@data-element=\"navigation\"]' : '';"); // stepKey: contentTypeLabelSelectorOpenEditMenuOnStage
-		$contentTypeSelectorOpenEditMenuOnStage = $I->executeJS("return ['row'].include('banner') ? '//div[contains(@class, \"pagebuilder-content-type-affordance\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-affordance-banner \")]' : '//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-banner \")]';"); // stepKey: contentTypeSelectorOpenEditMenuOnStage
-		$I->moveMouseOver("{$contentTypeSelectorOpenEditMenuOnStage}{$contentTypeLabelSelectorOpenEditMenuOnStage}", 10, 0); // stepKey: onMouseOverContentTypeStageOpenEditMenuOnStage
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadOpenEditMenuOnStage
-		$I->waitForElementVisible("(//div[contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]//div[contains(@class, \"pagebuilder-options\")])[1]", 10); // stepKey: waitForOptionsOpenEditMenuOnStage
-		$I->click("div.pagebuilder-content-type.pagebuilder-banner div.pagebuilder-options li.pagebuilder-options-link a.edit-content-type"); // stepKey: clickEditContentTypeOpenEditMenuOnStage
-		$I->waitForPageLoad(30); // stepKey: waitForEditFormToLoadOpenEditMenuOnStage
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 30); // stepKey: waitForEditFormOpenEditMenuOnStage
-		$I->see("Edit Banner", "aside._show .modal-title[data-role='title']"); // stepKey: seeContentTypeNameInEditFormTitleOpenEditMenuOnStage
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForAnimation2OpenEditMenuOnStage
-		$I->comment("Exiting Action Group [openEditMenuOnStage] openPageBuilderEditPanel");
-		$I->comment("Entering Action Group [setAppearance] chooseVisualSelectOption");
-		$I->waitForElement("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"appearance\"]", 2); // stepKey: waitForElementVisibleSetAppearance
-		$I->seeElement("//li[@name=\"collage-right\"]"); // stepKey: seeVisualSelectSetAppearance
-		$I->click("//div[@data-index=\"appearance_fieldset\"]//li[@name=\"collage-right\"]"); // stepKey: chooseVisualSelectOptionSetAppearance
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSetAppearance
-		$I->comment("Exiting Action Group [setAppearance] chooseVisualSelectOption");
-		$I->comment("Entering Action Group [enterMinHeightProperty] fillSlideOutPanelFieldGeneral");
-		$I->comment("This action group does not assert against the section changed icon since this doesn't exist for General sections");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadEnterMinHeightProperty
-		$I->waitForElement("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"min_height\"]", 2); // stepKey: waitForElementVisibleEnterMinHeightProperty
-		$I->see("Minimum Height", "//aside//div[@data-index=\"appearance_fieldset\"]/descendant::div[@data-index=\"min_height\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Minimum Height\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelEnterMinHeightProperty
-		$I->fillField("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@name=\"min_height\"]", "300px"); // stepKey: fillPropertyFieldEnterMinHeightProperty
-		$I->click("//aside//div[@data-index=\"appearance_fieldset\"]/descendant::div[@data-index=\"min_height\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"appearance_fieldset\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Minimum Height\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelEnterMinHeightProperty
-		$I->comment("Exiting Action Group [enterMinHeightProperty] fillSlideOutPanelFieldGeneral");
-		$I->comment("Set Edit Panel");
-		$I->comment("Entering Action Group [setBackgroundType] chooseVisualSelectOption");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_type\"]", 2); // stepKey: waitForElementVisibleSetBackgroundType
-		$I->seeElement("//li[@name=\"video\"]"); // stepKey: seeVisualSelectSetBackgroundType
-		$I->click("//div[@data-index=\"background\"]//li[@name=\"video\"]"); // stepKey: chooseVisualSelectOptionSetBackgroundType
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSetBackgroundType
-		$I->comment("Exiting Action Group [setBackgroundType] chooseVisualSelectOption");
-		$I->comment("Entering Action Group [enterVideoUrlValid] fillSlideOutPanelFieldGeneral");
-		$I->comment("This action group does not assert against the section changed icon since this doesn't exist for General sections");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadEnterVideoUrlValid
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", 2); // stepKey: waitForElementVisibleEnterVideoUrlValid
-		$I->see("Video URL", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelEnterVideoUrlValid
-		$I->fillField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", "https://www.youtube.com/embed/slOtnjsbff0"); // stepKey: fillPropertyFieldEnterVideoUrlValid
-		$I->click("//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelEnterVideoUrlValid
-		$I->comment("Exiting Action Group [enterVideoUrlValid] fillSlideOutPanelFieldGeneral");
-		$I->comment("Entering Action Group [disableInfiniteLoop] conditionalClickSlideOutPanelFieldGeneral");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]", 2); // stepKey: waitForElementVisibleDisableInfiniteLoop
-		$I->conditionalClick("//*[@name='video_loop']/parent::*/label", "//input[@type='checkbox' and @name='video_loop' and @value='false']", false); // stepKey: conditionalClickAttributeDisableInfiniteLoop
-		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_loop' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisableInfiniteLoop
-		$I->comment("Exiting Action Group [disableInfiniteLoop] conditionalClickSlideOutPanelFieldGeneral");
-		$I->comment("Entering Action Group [disableLazyLoad] conditionalClickSlideOutPanelFieldGeneral");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]", 2); // stepKey: waitForElementVisibleDisableLazyLoad
-		$I->conditionalClick("//*[@name='video_lazy_load']/parent::*/label", "//input[@type='checkbox' and @name='video_lazy_load' and @value='false']", false); // stepKey: conditionalClickAttributeDisableLazyLoad
-		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_lazy_load' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisableLazyLoad
-		$I->comment("Exiting Action Group [disableLazyLoad] conditionalClickSlideOutPanelFieldGeneral");
-		$I->comment("Entering Action Group [disablePlayOnlyWhenVisible] conditionalClickSlideOutPanelFieldGeneral");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]", 2); // stepKey: waitForElementVisibleDisablePlayOnlyWhenVisible
-		$I->conditionalClick("//*[@name='video_play_only_visible']/parent::*/label", "//input[@type='checkbox' and @name='video_play_only_visible' and @value='false']", false); // stepKey: conditionalClickAttributeDisablePlayOnlyWhenVisible
-		$I->waitForElementVisible("//input[@type='checkbox' and @name='video_play_only_visible' and @value='false']", 30); // stepKey: waitForAttributeStateChangeDisablePlayOnlyWhenVisible
-		$I->comment("Exiting Action Group [disablePlayOnlyWhenVisible] conditionalClickSlideOutPanelFieldGeneral");
-		$I->comment("Entering Action Group [selectShowButton] selectSlideOutPanelField");
-		$I->waitForElementVisible("//aside//div[@data-index=\"contents\"]/descendant::*[@name=\"show_button\"]", 2); // stepKey: waitForElementVisibleSelectShowButton
-		$I->selectOption("//aside//div[@data-index=\"contents\"]/descendant::*[@name=\"show_button\"]", "always"); // stepKey: selectPropertyFieldSelectShowButton
-		$I->click("//aside//div[@data-index=\"contents\"]/descendant::div[@data-index=\"show_button\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"contents\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Show Button\"][not(ancestor::legend)]"); // stepKey: clickOnFieldLabelSelectShowButton
-		$I->waitForElementVisible("[data-index='contents'] ._changed .admin__page-nav-item-message-icon", 2); // stepKey: waitForSectionChangedIconSelectShowButton
-		$I->comment("Exiting Action Group [selectShowButton] selectSlideOutPanelField");
-		$I->comment("Entering Action Group [saveEditPanelSettings] saveEditPanelSettings");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadSaveEditPanelSettings
-		$I->waitForElementVisible(".modal-header .page-main-actions [data-form-role='save']", 5); // stepKey: waitForSaveButtonSaveEditPanelSettings
-		$I->waitForPageLoad(30); // stepKey: waitForSaveButtonSaveEditPanelSettingsWaitForPageLoad
-		$I->click(".modal-header .page-main-actions [data-form-role='save']"); // stepKey: clickSaveButtonSaveEditPanelSettings
-		$I->waitForPageLoad(30); // stepKey: clickSaveButtonSaveEditPanelSettingsWaitForPageLoad
-		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSaveEditPanelSettings
-		$I->waitForElementNotVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 5); // stepKey: waitForEditFormNotVisibleSaveEditPanelSettings
-		$I->waitForElementVisible("#save-button", 10); // stepKey: waitForCmsPageSaveButtonSaveEditPanelSettings
-		$I->waitForPageLoad(10); // stepKey: waitForCmsPageSaveButtonSaveEditPanelSettingsWaitForPageLoad
-		$I->comment("Exiting Action Group [saveEditPanelSettings] saveEditPanelSettings");
-		$I->comment("Validate Stage");
-		$I->comment("Entering Action Group [validateStage1] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStage1
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStage1
-		$grabBackgroundColorValueValidateStage1 = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[contains(@class,\"pagebuilder-banner\") and @data-element=\"main\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStage1
-		$I->assertEquals("rgb(250, 250, 250)", $grabBackgroundColorValueValidateStage1); // stepKey: dontSeeBackgroundColorInDOMValidateStage1
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStage1
-		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStage1
-		$jarallaxStyleValidateStage1 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStage1
-		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStage1); // stepKey: assertHeightValidateStage1
-		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStage1); // stepKey: assertWidthValidateStage1
-		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStage1); // stepKey: assertOverflowHiddenValidateStage1
-		$videoStyleValidateStage1 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStage1
-		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStage1); // stepKey: assertVideoPositionValidateStage1
-		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStage1); // stepKey: assertVideoPlayingValidateStage1
-		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStage1
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStage1
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStage1
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStage1
-		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStage1
-		$I->dontSeeElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStage1
-		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStage1
-		$I->comment("Exiting Action Group [validateStage1] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->comment("Entering Action Group [inlineEdit] inlineEditWYSIWYGFromStage");
-		$I->click("(//div[@data-content-type='banner'])[1]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='banner' and contains(@class,'inline-wysiwyg')])[1]"); // stepKey: focusOnEditorAreaInlineEdit
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='banner'])[1][following-sibling::div[contains(@class,'tox-tinymce-inline')]]", 30); // stepKey: waitForEditorPanelInlineEdit
-		$I->pressKey("(//div[@data-content-type='banner'])[1]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='banner' and contains(@class,'inline-wysiwyg')])[1]", "Good Night!"); // stepKey: enterContentIntoEditorInlineEdit
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadInlineEdit
-		$I->click("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: loseFocusFromEditorInlineEdit
-		$I->waitForPageLoad(30); // stepKey: loseFocusFromEditorInlineEditWaitForPageLoad
-		$I->comment("Exiting Action Group [inlineEdit] inlineEditWYSIWYGFromStage");
-		$I->comment("Entering Action Group [inlineEditBannerButton] inlineEditSlideOrBannerButton");
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']", 30); // stepKey: waitForButtonVisibleInlineEditBannerButton
-		$I->click("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']"); // stepKey: clickButtonToEditInlineEditBannerButton
-		$I->pressKey("(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[1]//a//span[@contenteditable='true']", "Good Morning!"); // stepKey: enterButtonTextInlineEditBannerButton
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: seeButtonTextInlineEditBannerButton
-		$I->click("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: unFocusLiveEditInlineEditBannerButton
-		$I->waitForPageLoad(30); // stepKey: unFocusLiveEditInlineEditBannerButtonWaitForPageLoad
-		$I->waitForPageLoad(30); // stepKey: waitForUnFocusInlineEditBannerButton
-		$I->comment("Exiting Action Group [inlineEditBannerButton] inlineEditSlideOrBannerButton");
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStage
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: waitForButtonTextStage
-		$I->comment("Entering Action Group [exitPageBuilderFullScreen] exitPageBuilderFullScreen");
-		$I->waitForElementVisible(".pagebuilder-header .icon-pagebuilder-fullscreen-exit", 30); // stepKey: waitForExitPageBuilderFullScreenButtonExitPageBuilderFullScreen
-		$I->click(".pagebuilder-header .icon-pagebuilder-fullscreen-exit"); // stepKey: exitPageBuilderFullScreenExitPageBuilderFullScreen
-		$I->waitForPageLoad(30); // stepKey: waitForExitFullScreenExitPageBuilderFullScreen
-		$I->dontSeeElementInDOM(".pagebuilder-header .icon-pagebuilder-fullscreen-exit"); // stepKey: dontSeeExitPageBuilderFullScreenButtonExitPageBuilderFullScreen
-		$I->comment("Exiting Action Group [exitPageBuilderFullScreen] exitPageBuilderFullScreen");
-		$I->comment("Entering Action Group [saveAndContinueEditCmsPage] SaveAndContinueEditCmsPageActionGroup");
-		$I->waitForElementVisible("#save-button", 10); // stepKey: waitForSaveAndContinueVisibilitySaveAndContinueEditCmsPage
-		$I->waitForPageLoad(10); // stepKey: waitForSaveAndContinueVisibilitySaveAndContinueEditCmsPageWaitForPageLoad
-		$I->click("#save-button"); // stepKey: clickSaveAndContinueEditCmsPageSaveAndContinueEditCmsPage
-		$I->waitForPageLoad(10); // stepKey: clickSaveAndContinueEditCmsPageSaveAndContinueEditCmsPageWaitForPageLoad
-		$I->waitForPageLoad(30); // stepKey: waitForCmsPageLoadSaveAndContinueEditCmsPage
-		$I->waitForElementVisible(".page-header .page-title", 1); // stepKey: waitForCmsPageSaveButtonSaveAndContinueEditCmsPage
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForLoadingMaskSaveAndContinueEditCmsPage
-		$I->comment("Exiting Action Group [saveAndContinueEditCmsPage] SaveAndContinueEditCmsPageActionGroup");
-		$I->comment("Entering Action Group [switchToPageBuilderStage2] switchToPageBuilderStage");
-		$I->waitForElementVisible("div[data-index=content]", 30); // stepKey: waitForSectionSwitchToPageBuilderStage2
-		$I->conditionalClick("div[data-index=content]", "div[data-index=content]._show", false); // stepKey: expandSectionSwitchToPageBuilderStage2
-		$I->waitForPageLoad(30); // stepKey: waitForStageToLoadSwitchToPageBuilderStage2
-		$I->waitForElementVisible("div.stage-content-snapshot", 30); // stepKey: waitForSnapshotSwitchToPageBuilderStage2
-		$I->waitForElementVisible("//button/span[contains(text(), 'Edit with Page Builder')]", 30); // stepKey: waitForEditButtonSwitchToPageBuilderStage2
-		$I->click("//button/span[contains(text(), 'Edit with Page Builder')]"); // stepKey: clickEditButtonSwitchToPageBuilderStage2
-		$I->waitForPageLoad(30); // stepKey: waitForFullScreenAnimationSwitchToPageBuilderStage2
-		$I->waitForElementNotVisible("div.pagebuilder-stage-loading", 30); // stepKey: waitForStageLoadingGraphicNotVisibleSwitchToPageBuilderStage2
-		$I->waitForElementVisible("(//div[contains(@class,\"pagebuilder-content-type\") and contains(@class,\"pagebuilder-root-container\")])[1]", 30); // stepKey: waitForPageBuilderRootContainerSwitchToPageBuilderStage2
-		$I->comment("removing deprecated element");
-		$I->comment("Exiting Action Group [switchToPageBuilderStage2] switchToPageBuilderStage");
-		$I->comment("Validate Stage After Save");
-		$I->scrollTo("div[data-index=content]"); // stepKey: scrollBanner1Stage
-		$I->comment("Entering Action Group [validateStage2] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStage2
-		$grabBackgroundColorValueValidateStage2 = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[contains(@class,\"pagebuilder-banner\") and @data-element=\"main\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStage2
-		$I->assertEquals("rgb(250, 250, 250)", $grabBackgroundColorValueValidateStage2); // stepKey: dontSeeBackgroundColorInDOMValidateStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStage2
-		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStage2
-		$jarallaxStyleValidateStage2 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStage2
-		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStage2); // stepKey: assertHeightValidateStage2
-		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStage2); // stepKey: assertWidthValidateStage2
-		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStage2); // stepKey: assertOverflowHiddenValidateStage2
-		$videoStyleValidateStage2 = $I->grabAttributeFrom("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//iframe|(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStage2
-		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStage2); // stepKey: assertVideoPositionValidateStage2
-		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStage2); // stepKey: assertVideoPlayingValidateStage2
-		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper'][@data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStage2
-		$I->waitForElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStage2
-		$I->dontSeeElement("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStage2
-		$I->dontSeeElementInDOM("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='wrapper']//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStage2
-		$I->comment("Exiting Action Group [validateStage2] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStage2
-		$I->waitForElementVisible("(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[1]//a//span[.='Good Morning!']", 30); // stepKey: waitForButtonTextStage2
-		$I->comment("Validate Edit Panel After Save");
-		$I->comment("Entering Action Group [openEditPanelAfterSave] openPageBuilderEditPanel");
-		$I->moveMouseOver("//div[contains(@class,'stage-is-active')]//*[@id=\"search-content-types-input\"]"); // stepKey: moveMouseToSearchPanelOpenEditPanelAfterSave
-		$I->waitForPageLoad(30); // stepKey: moveMouseToSearchPanelOpenEditPanelAfterSaveWaitForPageLoad
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]", 10); // stepKey: waitForContentTypeInStageVisibleOpenEditPanelAfterSave
-		$contentTypeLabelSelectorOpenEditPanelAfterSave = $I->executeJS("return ['row', 'column'].include('banner') ? '//div[contains(@class, \"pagebuilder-display-label\") and contains(.,\"'+'banner'.toUpperCase()+'\")]' : ['tabs'].include('banner') ? '//ul[@data-element=\"navigation\"]' : '';"); // stepKey: contentTypeLabelSelectorOpenEditPanelAfterSave
-		$contentTypeSelectorOpenEditPanelAfterSave = $I->executeJS("return ['row'].include('banner') ? '//div[contains(@class, \"pagebuilder-content-type-affordance\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-affordance-banner \")]' : '//div[contains(@class, \"pagebuilder-content-type\") and contains(concat(\" \", @class, \" \"), \" pagebuilder-banner \")]';"); // stepKey: contentTypeSelectorOpenEditPanelAfterSave
-		$I->moveMouseOver("{$contentTypeSelectorOpenEditPanelAfterSave}{$contentTypeLabelSelectorOpenEditPanelAfterSave}", null, null); // stepKey: onMouseOverContentTypeStageOpenEditPanelAfterSave
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadOpenEditPanelAfterSave
-		$I->waitForElementVisible("(//div[contains(concat(' ', @class, ' '), ' pagebuilder-banner ')]//div[contains(@class, \"pagebuilder-options\")])[1]", 10); // stepKey: waitForOptionsOpenEditPanelAfterSave
-		$I->click("div.pagebuilder-content-type.pagebuilder-banner div.pagebuilder-options li.pagebuilder-options-link a.edit-content-type"); // stepKey: clickEditContentTypeOpenEditPanelAfterSave
-		$I->waitForPageLoad(30); // stepKey: waitForEditFormToLoadOpenEditPanelAfterSave
-		$I->waitForElementVisible("//div[contains(@class, \"pagebuilder_modal_form_pagebuilder_modal_form_modal\")]", 30); // stepKey: waitForEditFormOpenEditPanelAfterSave
-		$I->see("Edit Banner", "aside._show .modal-title[data-role='title']"); // stepKey: seeContentTypeNameInEditFormTitleOpenEditPanelAfterSave
-		$I->waitForLoadingMaskToDisappear(); // stepKey: waitForAnimation2OpenEditPanelAfterSave
-		$I->comment("Exiting Action Group [openEditPanelAfterSave] openPageBuilderEditPanel");
-		$I->comment("Entering Action Group [validateBackgroundColorEmptyAfterSave] seeInFieldSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_color\"]", 2); // stepKey: waitForElementVisibleValidateBackgroundColorEmptyAfterSave
-		$I->see("Background Color", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"background_color\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Background Color\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateBackgroundColorEmptyAfterSave
-		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"background_color\"]", ""); // stepKey: seeInFieldPropertyValidateBackgroundColorEmptyAfterSave
-		$I->comment("Exiting Action Group [validateBackgroundColorEmptyAfterSave] seeInFieldSlideOutProperty");
-		$I->comment("Entering Action Group [validateVideoUrlAfterSave] seeInFieldSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", 2); // stepKey: waitForElementVisibleValidateVideoUrlAfterSave
-		$I->see("Video URL", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_source\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Video URL\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateVideoUrlAfterSave
-		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_source\"]", "https://www.youtube.com/embed/slOtnjsbff0"); // stepKey: seeInFieldPropertyValidateVideoUrlAfterSave
-		$I->comment("Exiting Action Group [validateVideoUrlAfterSave] seeInFieldSlideOutProperty");
-		$I->comment("Entering Action Group [validateOverlayColorEmptyAfterSave] seeInFieldSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_overlay_color\"]", 2); // stepKey: waitForElementVisibleValidateOverlayColorEmptyAfterSave
-		$I->see("Overlay Color", "//aside//div[@data-index=\"background\"]/descendant::div[@data-index=\"video_overlay_color\"]/descendant::label[not(contains(@style,\"display: none;\"))] | //aside//div[@data-index=\"background\"]/descendant::*[@class=\"admin__field-label\" or @class=\"title\"]/descendant::span[text()=\"Overlay Color\"][not(ancestor::legend)]"); // stepKey: seePropertyLabelValidateOverlayColorEmptyAfterSave
-		$I->seeInField("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_overlay_color\"]", ""); // stepKey: seeInFieldPropertyValidateOverlayColorEmptyAfterSave
-		$I->comment("Exiting Action Group [validateOverlayColorEmptyAfterSave] seeInFieldSlideOutProperty");
-		$I->comment("Entering Action Group [validateInfiniteLoopAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]", 2); // stepKey: waitForElementVisibleValidateInfiniteLoopAfterSave
-		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_loop\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidateInfiniteLoopAfterSave
-		$I->comment("Exiting Action Group [validateInfiniteLoopAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->comment("Entering Action Group [validateLazyLoadAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]", 2); // stepKey: waitForElementVisibleValidateLazyLoadAfterSave
-		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_lazy_load\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidateLazyLoadAfterSave
-		$I->comment("Exiting Action Group [validateLazyLoadAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->comment("Entering Action Group [validatePlayOnlyWhenVisibleAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]", 2); // stepKey: waitForElementVisibleValidatePlayOnlyWhenVisibleAfterSave
-		$I->dontSeeCheckboxIsChecked("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_play_only_visible\"]"); // stepKey: dontSeeOptionIsCheckedPropertyValidatePlayOnlyWhenVisibleAfterSave
-		$I->comment("Exiting Action Group [validatePlayOnlyWhenVisibleAfterSave] seeOptionIsNotCheckedSlideOutProperty");
-		$I->comment("Entering Action Group [validateNoFallbackImageAfterSave] seeNoImageUploadedOnSlideOut");
-		$I->waitForElement("//aside//div[@data-index=\"background\"]/descendant::*[@name=\"video_fallback_image\"]", 30); // stepKey: waitForElementValidateNoFallbackImageAfterSave
-		$I->waitForElementVisible("//span[text()='Fallback Image']//parent::label//following-sibling::div//p[text()='Browse to find or drag image here']", 30); // stepKey: seeNoUploadedFileValidateNoFallbackImageAfterSave
-		$I->comment("Exiting Action Group [validateNoFallbackImageAfterSave] seeNoImageUploadedOnSlideOut");
-		$I->comment("Validate Storefront");
-		$I->comment("Entering Action Group [navigateToStorefront] NavigateToStorefrontForCreatedPageActionGroup");
-		$I->amOnPage($I->retrieveEntityField('createCMSPage', 'identifier', 'test')); // stepKey: goToStorefrontNavigateToStorefront
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadNavigateToStorefront
-		$I->comment("Exiting Action Group [navigateToStorefront] NavigateToStorefrontForCreatedPageActionGroup");
-		$I->comment("Entering Action Group [validateStorefront] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->waitForPageLoad(30); // stepKey: waitForPageLoadValidateStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-background-type='video']", 30); // stepKey: waitForVideoBackgroundValidateStorefront
-		$grabBackgroundColorValueValidateStorefront = $I->executeJS("return window.getComputedStyle(document.evaluate('(//div[@data-content-type=\"banner\"])[1]//div[@data-element=\"wrapper\"]', document.body).iterateNext()).backgroundColor"); // stepKey: grabBackgroundColorValueValidateStorefront
-		$I->assertEquals("rgba(0, 0, 0, 0)", $grabBackgroundColorValueValidateStorefront); // stepKey: dontSeeBackgroundColorInDOMValidateStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//video", 30); // stepKey: waitForVideoVisibleValidateStorefront
-		$I->waitForElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//*[contains(@src,'https://www.youtube.com/embed/slOtnjsbff0')]", 30); // stepKey: waitForVideoUrlValidateStorefront
-		$jarallaxStyleValidateStorefront = $I->grabAttributeFrom("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]", "style"); // stepKey: jarallaxStyleValidateStorefront
-		$I->assertStringContainsString("height: 100%;", $jarallaxStyleValidateStorefront); // stepKey: assertHeightValidateStorefront
-		$I->assertStringContainsString("width: 100%;", $jarallaxStyleValidateStorefront); // stepKey: assertWidthValidateStorefront
-		$I->assertStringContainsString("overflow: hidden;", $jarallaxStyleValidateStorefront); // stepKey: assertOverflowHiddenValidateStorefront
-		$videoStyleValidateStorefront = $I->grabAttributeFrom("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//video", "style"); // stepKey: videoStyleValidateStorefront
-		$I->assertStringContainsString("position: absolute;", $videoStyleValidateStorefront); // stepKey: assertVideoPositionValidateStorefront
-		$I->assertStringContainsString("transform: translate3d(", $videoStyleValidateStorefront); // stepKey: assertVideoPlayingValidateStorefront
-		$I->dontSeeElementInDOM("(//div[@data-content-type='banner'])[1]//div[@data-element='video_overlay']"); // stepKey: dontSeeOverlayColorInDOMValidateStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-loop='false']", 30); // stepKey: waitForInfiniteLoopValidateStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-lazy-load='false']", 30); // stepKey: waitForLazyLoadValidateStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper' and @data-video-play-only-visible='false']", 30); // stepKey: waitForPlayOnlyWhenVisibleValidateStorefront
-		$I->waitForElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//div", 30); // stepKey: waitForNoFallbackImageValidateStorefront
-		$I->dontSeeElement("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//div"); // stepKey: dontSeeFallbackImageValidateStorefront
-		$I->dontSeeElementInDOM("(//div[@data-content-type='banner'])[1]//div[contains(@id,'jarallax-container')]//img"); // stepKey: dontSeeFallbackImageInDOMValidateStorefront
-		$I->comment("Exiting Action Group [validateStorefront] validateVideoBackgroundWithOnlyVideoUrl");
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='content']//*[contains(text(),'Good Night!')]", 30); // stepKey: waitForMessageContentStorefront
-		$I->waitForElementVisible("(//div[@data-content-type='banner'])[1]//div[@data-element='wrapper']//button[.='Good Morning!']", 30); // stepKey: waitForButtonTextStorefront
-	}
-}

From 71d50020d58027ecf6321f166c577db00deb6cb0 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Sun, 12 Sep 2021 12:44:33 +0100
Subject: [PATCH 08/27] #32996 - mark json as noEscape

---
 .../Customer/view/frontend/templates/form/register.phtml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index d08f201663803..d0bc41a2d39e8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -357,9 +357,9 @@ script;
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?= $regionJson ?>,
-                "defaultRegion": <?= $regionId ?>,
-                "countriesWithOptionalZip": <?= $countriesWithOptionalZip ?>
+                "regionJson": <?= /* @noEscape */ $regionJson ?>,
+                "defaultRegion": <?= /* @noEscape */ $regionId ?>,
+                "countriesWithOptionalZip": <?=  /* @noEscape */ $countriesWithOptionalZip ?>
             }
         }
     }

From 3e4b8c24e0ee35a152ff4199bc02561720fceb08 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Thu, 16 Sep 2021 14:41:47 +0100
Subject: [PATCH 09/27] #32996 add js unit tests for region-updater

---
 .../frontend/js/region-updater.test.js        | 249 ++++++++++++++++++
 1 file changed, 249 insertions(+)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
new file mode 100644
index 0000000000000..0cd4d0ffe23fb
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
@@ -0,0 +1,249 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*eslint-disable max-nested-callbacks*/
+/*jscs:disable jsDoc*/
+define([
+    'jquery',
+    'Magento_Directory/js/region-updater'
+], function ($) {
+    'use strict';
+
+    var regionJson = {
+            'config': {
+                'show_all_regions': true,
+                'regions_required': [
+                    'US'
+                ]
+            },
+            'US': {
+                '1': {
+                    'id'  : 1,
+                    'code': 'AL',
+                    'name': 'Alabama'
+                },
+                '2': {
+                    'id'  : 2,
+                    'code': 'AK',
+                    'name': 'Alaska'
+                },
+                '3': {
+                    'id'  : 3,
+                    'code': 'AS',
+                    'name': 'American Samoa'
+                }
+            },
+            'DE': {
+                '81': {
+                    'id'  : 4,
+                    'code': 'BAY',
+                    'name': 'Bayern'
+                },
+                '82': {
+                    'id'  : 5,
+                    'code': 'BER',
+                    'name': 'Berlin'
+                },
+                '83': {
+                    'id'  : 6,
+                    'code': 'BRG',
+                    'name': 'Brandenburg'
+                }
+            }
+        },
+        defaultCountry = 'GB',
+        countries = {
+            '': '',
+            'US': 'United States',
+            'GB': 'United Kingdom',
+            'DE': 'Germany',
+            'IT': 'Italy'
+        },
+        regions = {
+            '': 'Please select a region, state or province.'
+        },
+        countryEl,
+        regionSelectEl,
+        regionInputEl,
+        postalCodeEl,
+        formEl,
+        containerEl;
+
+    function createFormField() {
+        var fieldWrapperEl = document.createElement('div'),
+            labelEl = document.createElement('label'),
+            inputControlEl = document.createElement('div'),
+            i;
+
+        fieldWrapperEl.appendChild(labelEl);
+        fieldWrapperEl.appendChild(inputControlEl);
+
+        for (i = 0; i < arguments.length; i++) {
+            inputControlEl.appendChild(arguments[i]);
+        }
+        labelEl.setAttribute('class', 'label');
+        fieldWrapperEl.setAttribute('class', 'field required');
+        inputControlEl.setAttribute('class', 'control');
+
+        return fieldWrapperEl;
+    }
+
+    function buildSelectOptions(select, options, defaultOption) {
+        var optionValue,
+            optionEl;
+
+        defaultOption = typeof defaultOption === 'undefined' ? '' : defaultOption;
+
+        // eslint-disable-next-line guard-for-in
+        for (optionValue in options) {
+            if (options.hasOwnProperty(optionValue)) {
+                optionEl = document.createElement('option');
+                optionEl.setAttribute('value', optionValue);
+                optionEl.textContent = countries[optionValue];
+                // eslint-disable-next-line max-depth
+                if (defaultOption === optionValue) {
+                    optionEl.setAttribute('selected', 'selected');
+                }
+                select.add(optionEl);
+            }
+        }
+    }
+
+    function init(config) {
+        var defaultConfig = {
+            'optionalRegionAllowed': true,
+            'regionListId': '#' + regionSelectEl.id,
+            'regionInputId': '#' + regionInputEl.id,
+            'postcodeId': '#' + postalCodeEl.id,
+            'form': '#' + formEl.id,
+            'regionJson': regionJson,
+            'defaultRegion': 0,
+            'countriesWithOptionalZip': ['GB']
+        };
+
+        $(countryEl).regionUpdater($.extend({}, defaultConfig, config || {}));
+    }
+
+    beforeEach(function () {
+        containerEl = document.createElement('div');
+        formEl = document.createElement('form');
+        regionSelectEl = document.createElement('select');
+        regionInputEl = document.createElement('input');
+        postalCodeEl = document.createElement('input');
+        countryEl = document.createElement('select');
+        regionSelectEl.setAttribute('id', 'region_id');
+        regionSelectEl.setAttribute('style', 'display:none;');
+        regionInputEl.setAttribute('id', 'region');
+        regionInputEl.setAttribute('style', 'display:none;');
+        countryEl.setAttribute('id', 'country');
+        postalCodeEl.setAttribute('id', 'zip');
+        formEl.setAttribute('id', 'test_form');
+        formEl.appendChild(createFormField(countryEl));
+        formEl.appendChild(createFormField(regionSelectEl, regionInputEl));
+        formEl.appendChild(createFormField(postalCodeEl));
+        containerEl.appendChild(formEl);
+        buildSelectOptions(regionSelectEl, regions);
+        buildSelectOptions(countryEl, countries, defaultCountry);
+        document.body.appendChild(containerEl);
+    });
+
+    afterEach(function () {
+        $(containerEl).remove();
+        formEl = undefined;
+        containerEl = undefined;
+        regionSelectEl = undefined;
+        regionInputEl = undefined;
+        postalCodeEl = undefined;
+        countryEl = undefined;
+    });
+
+    describe('Magento_Directory/js/region-updater', function () {
+        it('Check that default country is selected', function () {
+            init();
+            expect($(countryEl).val()).toBe(defaultCountry);
+        });
+        it('Check that region list is not displayed when selected country has no predefined regions', function () {
+            init();
+            $(countryEl).val('GB').trigger('change');
+            expect($(regionInputEl).is(':visible')).toBe(true);
+            expect($(regionInputEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionSelectEl).is(':disabled')).toBe(true);
+        });
+        it('Check country that has predefined and optional regions', function () {
+            init();
+            $(countryEl).val('DE').trigger('change');
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Berlin');
+        });
+        it('Check country that has predefined and required regions', function () {
+            init();
+            $(countryEl).val('US').trigger('change');
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(true);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Alaska');
+        });
+        it('Check that region fields are not displayed for country with optional regions if configured', function () {
+            init({
+                optionalRegionAllowed: false
+            });
+            $(countryEl).val('DE').trigger('change');
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+        });
+        it('Check that initial values are not overwritten - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            $(postalCodeEl).val('L13 0AL');
+            init();
+            expect($(countryEl).val()).toBe('GB');
+            expect($(regionInputEl).val()).toBe('Liverpool');
+            expect($(postalCodeEl).val()).toBe('L13 0AL');
+        });
+        it('Check that initial values are not overwritten - region select', function () {
+            $(countryEl).val('US');
+            $(postalCodeEl).val('99501');
+            init({
+                defaultRegion: '2'
+            });
+            expect($(countryEl).val()).toBe('US');
+            expect($(regionSelectEl).find('option:selected').text()).toBe('Alaska');
+            expect($(postalCodeEl).val()).toBe('99501');
+        });
+        it('Check that region values are cleared out on country change - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            init();
+            $(countryEl).val('IT').trigger('change');
+            expect($(countryEl).val()).toBe('IT');
+            expect($(regionInputEl).val()).toBe('');
+        });
+        it('Check that region values are cleared out on country change - region select', function () {
+            $(countryEl).val('US');
+            init({
+                defaultRegion: '2'
+            });
+            $(countryEl).val('DE').trigger('change');
+            expect($(countryEl).val()).toBe('DE');
+            expect($(regionSelectEl).val()).toBe('');
+        });
+    });
+});

From 534516e5e6fffa6d7ce270819739ad60dc5f376d Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Thu, 16 Sep 2021 16:03:31 +0100
Subject: [PATCH 10/27] #32996 fix static tests

---
 .../Directory/frontend/js/region-updater.test.js     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
index 0cd4d0ffe23fb..549a473274dc1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
@@ -19,34 +19,34 @@ define([
             },
             'US': {
                 '1': {
-                    'id'  : 1,
+                    'id': 1,
                     'code': 'AL',
                     'name': 'Alabama'
                 },
                 '2': {
-                    'id'  : 2,
+                    'id': 2,
                     'code': 'AK',
                     'name': 'Alaska'
                 },
                 '3': {
-                    'id'  : 3,
+                    'id': 3,
                     'code': 'AS',
                     'name': 'American Samoa'
                 }
             },
             'DE': {
                 '81': {
-                    'id'  : 4,
+                    'id': 4,
                     'code': 'BAY',
                     'name': 'Bayern'
                 },
                 '82': {
-                    'id'  : 5,
+                    'id': 5,
                     'code': 'BER',
                     'name': 'Berlin'
                 },
                 '83': {
-                    'id'  : 6,
+                    'id': 6,
                     'code': 'BRG',
                     'name': 'Brandenburg'
                 }

From 7914825233e4ca7225923741248352a438b26580 Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Fri, 17 Sep 2021 17:37:09 -0400
Subject: [PATCH 11/27] PWA-2110: Making GraphQL scalar type definitions
 backwards-compatible

---
 .../Magento/GraphQl/Controller/GraphQl.php    | 29 +++++++++++
 .../GraphQl/Type/Definition/FloatType.php     | 50 +++++++++++++++++++
 .../GraphQl/Type/Definition/IntType.php       | 50 +++++++++++++++++++
 .../GraphQl/Type/Definition/StringType.php    | 50 +++++++++++++++++++
 4 files changed, 179 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 29389030e7684..39e708e2276c9 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Controller;
 
+use GraphQL\Type\Definition\Type as GraphQLType;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\Http;
@@ -19,6 +20,9 @@
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
+use Magento\Framework\GraphQl\Type\Definition\FloatType;
+use Magento\Framework\GraphQl\Type\Definition\IntType;
+use Magento\Framework\GraphQl\Type\Definition\StringType;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
 use Magento\GraphQl\Helper\Query\Logger\LogData;
@@ -163,6 +167,8 @@ public function dispatch(RequestInterface $request): ResponseInterface
 
         $schema = null;
         try {
+            $this->overrideStandardGraphQLTypes();
+
             /** @var Http $request */
             $this->requestProcessor->validateRequest($request);
 
@@ -199,6 +205,29 @@ public function dispatch(RequestInterface $request): ResponseInterface
         return $this->httpResponse;
     }
 
+    /**
+     * Replace the standard type definitions with ones that know how to cast input values
+     */
+    private function overrideStandardGraphQLTypes(): void
+    {
+        $standardTypes = GraphQLType::getStandardTypes();
+//        $intConfig = [
+//            'name' => $standardInt->name,
+//            'description' => $standardInt->description,
+//            'astNode' => $standardInt->astNode,
+//            'extensionASTNodes' => $standardInt->extensionASTNodes
+//        ];
+
+        $intType = new IntType($standardTypes[GraphQLType::INT]->config);
+        $floatType = new FloatType($standardTypes[GraphQLType::FLOAT]->config);
+        $stringType = new StringType($standardTypes[GraphQLType::STRING]->config);
+        \GraphQL\GraphQL::overrideStandardTypes([
+            GraphQLType::INT => $intType,
+            GraphQLType::FLOAT => $floatType,
+            GraphQLType::STRING => $stringType
+        ]);
+    }
+
     /**
      * Get data from request body or query string
      *
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
new file mode 100644
index 0000000000000..af5f67141fab4
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+use Exception;
+use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\Node;
+
+/**
+ * Replacement for the FloatType definition that can typecast non-numeric values for backwards compatibility
+ */
+class FloatType extends \GraphQL\Type\Definition\FloatType
+{
+    /**
+     * Try to typecast valid values before running the native validations
+     *
+     * @param mixed $value
+     * @return float
+     * @throws GraphQLError
+     */
+    public function parseValue($value): float
+    {
+        if ($value !== '' && (is_numeric($value) || is_bool($value))) {
+            $value = (float)$value;
+        }
+        return parent::parseValue($value);
+    }
+
+    /**
+     * Try to parse the literal value the same way as a variable before calling the native literal parsing
+     *
+     * @param Node $valueNode
+     * @param array|null $variables
+     * @return float
+     * @throws Exception
+     */
+    public function parseLiteral(Node $valueNode, ?array $variables = null): float
+    {
+        try {
+            return $this->parseValue($valueNode->value);
+        } catch (Exception $e) {
+        }
+        return parent::parseLiteral($valueNode);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
new file mode 100644
index 0000000000000..b86eea46dcb4d
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+use Exception;
+use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\Node;
+
+/**
+ * Replacement for the IntType definition that can typecast non-numeric values for backwards compatibility
+ */
+class IntType extends \GraphQl\Type\Definition\IntType
+{
+    /**
+     * Try to typecast valid values before running the native validations
+     *
+     * @param mixed $value
+     * @return int
+     * @throws GraphQLError
+     */
+    public function parseValue($value): int
+    {
+        if ($value !== '' && (is_numeric($value) || is_bool($value))) {
+            $value = (float)$value;
+        }
+        return parent::parseValue($value);
+    }
+
+    /**
+     * Try to parse the literal value the same way as a variable before calling the native literal parsing
+     *
+     * @param Node $valueNode
+     * @param array|null $variables
+     * @return int
+     * @throws Exception
+     */
+    public function parseLiteral(Node $valueNode, ?array $variables = null): int
+    {
+        try {
+            return $this->parseValue($valueNode->value);
+        } catch (Exception $e) {
+        }
+        return parent::parseLiteral($valueNode);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
new file mode 100644
index 0000000000000..40fa20413c037
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Type\Definition;
+
+use Exception;
+use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\Node;
+
+/**
+ * Replacement for the StringType definition that can typecast non-string values for backwards compatibility
+ */
+class StringType extends \GraphQl\Type\Definition\StringType
+{
+    /**
+     * Try to typecast valid values before running the native validations
+     *
+     * @param mixed $value
+     * @return string
+     * @throws GraphQLError
+     */
+    public function parseValue($value): string
+    {
+        if (!is_array($value)) {
+            $value = (string)$value;
+        }
+        return parent::parseValue($value);
+    }
+
+    /**
+     * Try to parse the literal value the same way as a variable before calling the native literal parsing
+     *
+     * @param Node $valueNode
+     * @param array|null $variables
+     * @return string
+     * @throws Exception
+     */
+    public function parseLiteral(Node $valueNode, ?array $variables = null): string
+    {
+        try {
+            return $this->parseValue($valueNode->value);
+        } catch (Exception $e) {
+        }
+        return parent::parseLiteral($valueNode);
+    }
+}

From 493eabfb57dd1c665a53aa67c50547489ad5d8bf Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Fri, 17 Sep 2021 18:22:50 -0400
Subject: [PATCH 12/27] Fixing calls to parent::parseLiteral()

---
 app/code/Magento/GraphQl/Controller/GraphQl.php |  6 ------
 .../GraphQl/Type/Definition/FloatType.php       | 17 +++++++++++++++--
 .../GraphQl/Type/Definition/IntType.php         | 15 +++++++++++++--
 .../GraphQl/Type/Definition/StringType.php      | 15 +++++++++++++--
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 39e708e2276c9..5c85e0255e94c 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -211,12 +211,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
     private function overrideStandardGraphQLTypes(): void
     {
         $standardTypes = GraphQLType::getStandardTypes();
-//        $intConfig = [
-//            'name' => $standardInt->name,
-//            'description' => $standardInt->description,
-//            'astNode' => $standardInt->astNode,
-//            'extensionASTNodes' => $standardInt->extensionASTNodes
-//        ];
 
         $intType = new IntType($standardTypes[GraphQLType::INT]->config);
         $floatType = new FloatType($standardTypes[GraphQLType::FLOAT]->config);
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
index af5f67141fab4..4d465818aa9ec 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
@@ -9,7 +9,10 @@
 
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\FloatValueNode;
+use GraphQL\Language\AST\IntValueNode;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the FloatType definition that can typecast non-numeric values for backwards compatibility
@@ -42,9 +45,19 @@ public function parseValue($value): float
     public function parseLiteral(Node $valueNode, ?array $variables = null): float
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof FloatValueNode)
+                && !($valueNode instanceof IntValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new FloatValueNode([
+                    'value' => (string)$this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
index b86eea46dcb4d..93654120f7be5 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
@@ -9,7 +9,9 @@
 
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
+use GraphQL\Language\AST\IntValueNode;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the IntType definition that can typecast non-numeric values for backwards compatibility
@@ -42,9 +44,18 @@ public function parseValue($value): int
     public function parseLiteral(Node $valueNode, ?array $variables = null): int
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof IntValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new IntValueNode([
+                    'value' => (string)$this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
index 40fa20413c037..c0b5b9b9a38f5 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
@@ -10,6 +10,8 @@
 use Exception;
 use GraphQL\Error\Error as GraphQLError;
 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\StringValueNode;
+use GraphQL\Language\AST\ValueNode;
 
 /**
  * Replacement for the StringType definition that can typecast non-string values for backwards compatibility
@@ -42,9 +44,18 @@ public function parseValue($value): string
     public function parseLiteral(Node $valueNode, ?array $variables = null): string
     {
         try {
-            return $this->parseValue($valueNode->value);
+            if (
+                $valueNode instanceof ValueNode
+                && !($valueNode instanceof StringValueNode)
+                && isset($valueNode->value)
+            ) {
+                $valueNode = new StringValueNode([
+                    'value' => $this->parseValue($valueNode->value),
+                    'loc' => $valueNode->loc
+                ]);
+            }
         } catch (Exception $e) {
         }
-        return parent::parseLiteral($valueNode);
+        return parent::parseLiteral($valueNode, $variables);
     }
 }

From b61b550a0cbd1cd9be355b23e2d201306eaf7381 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Mon, 20 Sep 2021 12:09:56 +0100
Subject: [PATCH 13/27] 32996 - unit test fixes

---
 .../view/frontend/web/js/region-updater.js    |  4 +-
 .../frontend/js/region-updater.test.js        | 80 ++++++++++---------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/Directory/view/frontend/web/js/region-updater.js b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
index ef3aaee1fbec1..9d22cf90f258e 100644
--- a/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Directory/view/frontend/web/js/region-updater.js
@@ -12,7 +12,7 @@ define([
 ], function ($, mageTemplate, _) {
     'use strict';
 
-    $.widget('mage.regionUpdater', {
+    $.widget('mage.directoryRegionUpdater', {
         options: {
             regionTemplate:
                 '<option value="<%- data.value %>" <% if (data.isSelected) { %>selected="selected"<% } %>>' +
@@ -256,5 +256,5 @@ define([
         }
     });
 
-    return $.mage.regionUpdater;
+    return $.mage.directoryRegionUpdater;
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
index 549a473274dc1..efe218b13a5be 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
@@ -17,40 +17,42 @@ define([
                     'US'
                 ]
             },
-            'US': {
-                '1': {
-                    'id': 1,
-                    'code': 'AL',
-                    'name': 'Alabama'
-                },
-                '2': {
-                    'id': 2,
-                    'code': 'AK',
-                    'name': 'Alaska'
-                },
-                '3': {
-                    'id': 3,
-                    'code': 'AS',
-                    'name': 'American Samoa'
-                }
-            },
-            'DE': {
-                '81': {
-                    'id': 4,
-                    'code': 'BAY',
-                    'name': 'Bayern'
-                },
-                '82': {
-                    'id': 5,
-                    'code': 'BER',
-                    'name': 'Berlin'
-                },
-                '83': {
-                    'id': 6,
-                    'code': 'BRG',
-                    'name': 'Brandenburg'
-                }
-            }
+            'US':
+                [
+                    {
+                        'id': 1,
+                        'code': 'AL',
+                        'name': 'Alabama'
+                    },
+                    {
+                        'id': 2,
+                        'code': 'AK',
+                        'name': 'Alaska'
+                    },
+                    {
+                        'id': 3,
+                        'code': 'AS',
+                        'name': 'American Samoa'
+                    }
+                ],
+            'DE':
+                [
+                    {
+                        'id': 81,
+                        'code': 'BAY',
+                        'name': 'Bayern'
+                   },
+                   {
+                        'id': 82,
+                        'code': 'BER',
+                        'name': 'Berlin'
+                   },
+                    {
+                       'id': 83,
+                       'code': 'BRG',
+                       'name': 'Brandenburg'
+                   }
+            ]
         },
         defaultCountry = 'GB',
         countries = {
@@ -122,7 +124,7 @@ define([
             'countriesWithOptionalZip': ['GB']
         };
 
-        $(countryEl).regionUpdater($.extend({}, defaultConfig, config || {}));
+        $(countryEl).directoryRegionUpdater($.extend({}, defaultConfig, config || {}));
     }
 
     beforeEach(function () {
@@ -132,13 +134,13 @@ define([
         regionInputEl = document.createElement('input');
         postalCodeEl = document.createElement('input');
         countryEl = document.createElement('select');
-        regionSelectEl.setAttribute('id', 'region_id');
+        regionSelectEl.setAttribute('id', 'dir_region_id');
         regionSelectEl.setAttribute('style', 'display:none;');
-        regionInputEl.setAttribute('id', 'region');
+        regionInputEl.setAttribute('id', 'dir_region');
         regionInputEl.setAttribute('style', 'display:none;');
-        countryEl.setAttribute('id', 'country');
+        countryEl.setAttribute('id', 'dir_country');
         postalCodeEl.setAttribute('id', 'zip');
-        formEl.setAttribute('id', 'test_form');
+        formEl.setAttribute('id', 'dir_test_form');
         formEl.appendChild(createFormField(countryEl));
         formEl.appendChild(createFormField(regionSelectEl, regionInputEl));
         formEl.appendChild(createFormField(postalCodeEl));

From b157aada694cd0c5a02762ebdac3133ad9b3b8b8 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Tue, 21 Sep 2021 09:38:46 +0100
Subject: [PATCH 14/27] #32996 - fix static tests

---
 .../Directory/frontend/js/region-updater.test.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
index efe218b13a5be..150769f581ea4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Directory/frontend/js/region-updater.test.js
@@ -41,18 +41,18 @@ define([
                         'id': 81,
                         'code': 'BAY',
                         'name': 'Bayern'
-                   },
-                   {
+                    },
+                    {
                         'id': 82,
                         'code': 'BER',
                         'name': 'Berlin'
-                   },
+                    },
                     {
-                       'id': 83,
-                       'code': 'BRG',
-                       'name': 'Brandenburg'
-                   }
-            ]
+                        'id': 83,
+                        'code': 'BRG',
+                        'name': 'Brandenburg'
+                    }
+                ]
         },
         defaultCountry = 'GB',
         countries = {

From b54639b04c0aa705d07a36a928fbb91d0d346910 Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Tue, 21 Sep 2021 17:34:35 -0400
Subject: [PATCH 15/27] Moving override call upstream

---
 .../Magento/GraphQl/Controller/GraphQl.php    | 23 -------------------
 .../GraphQlSchemaStitching/GraphQlReader.php  | 21 +++++++++++++++++
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 5c85e0255e94c..29389030e7684 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Controller;
 
-use GraphQL\Type\Definition\Type as GraphQLType;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\Http;
@@ -20,9 +19,6 @@
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\Type\Definition\FloatType;
-use Magento\Framework\GraphQl\Type\Definition\IntType;
-use Magento\Framework\GraphQl\Type\Definition\StringType;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
 use Magento\GraphQl\Helper\Query\Logger\LogData;
@@ -167,8 +163,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
 
         $schema = null;
         try {
-            $this->overrideStandardGraphQLTypes();
-
             /** @var Http $request */
             $this->requestProcessor->validateRequest($request);
 
@@ -205,23 +199,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
         return $this->httpResponse;
     }
 
-    /**
-     * Replace the standard type definitions with ones that know how to cast input values
-     */
-    private function overrideStandardGraphQLTypes(): void
-    {
-        $standardTypes = GraphQLType::getStandardTypes();
-
-        $intType = new IntType($standardTypes[GraphQLType::INT]->config);
-        $floatType = new FloatType($standardTypes[GraphQLType::FLOAT]->config);
-        $stringType = new StringType($standardTypes[GraphQLType::STRING]->config);
-        \GraphQL\GraphQL::overrideStandardTypes([
-            GraphQLType::INT => $intType,
-            GraphQLType::FLOAT => $floatType,
-            GraphQLType::STRING => $stringType
-        ]);
-    }
-
     /**
      * Get data from request body or query string
      *
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 2a84beb53d3e5..61ca2be53ea3e 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -7,11 +7,16 @@
 
 namespace Magento\Framework\GraphQlSchemaStitching;
 
+use GraphQL\GraphQL;
 use GraphQL\Type\Definition\ScalarType;
+use GraphQL\Type\Definition\Type as GraphQLType;
 use GraphQL\Utils\BuildSchema;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\FileResolverInterface;
 use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQl\Type\Definition\FloatType;
+use Magento\Framework\GraphQl\Type\Definition\IntType;
+use Magento\Framework\GraphQl\Type\Definition\StringType;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InterfaceType;
 
@@ -70,6 +75,7 @@ public function __construct(
         $this->typeReader = $typeReader;
         $this->defaultScope = $defaultScope;
         $this->fileName = $fileName;
+        $this->overrideStandardGraphQLTypes();
     }
 
     /**
@@ -343,4 +349,19 @@ private function addModuleNameToTypes(array $source, string $filePath): array
 
         return $source;
     }
+
+
+    /**
+     * Replace the standard type definitions with ones that know how to cast input values
+     */
+    private function overrideStandardGraphQLTypes(): void
+    {
+        $standardTypes = GraphQLType::getStandardTypes();
+
+        GraphQL::overrideStandardTypes([
+            GraphQLType::INT => new IntType($standardTypes[GraphQLType::INT]->config),
+            GraphQLType::FLOAT => new FloatType($standardTypes[GraphQLType::FLOAT]->config),
+            GraphQLType::STRING => new StringType($standardTypes[GraphQLType::STRING]->config)
+        ]);
+    }
 }

From 2c2f450f92f3365bf4dcb0ad5b584f852542f5cf Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Wed, 22 Sep 2021 12:13:18 -0400
Subject: [PATCH 16/27] Fixing static test failures

---
 .../Framework/GraphQl/Type/Definition/FloatType.php    |  8 ++++----
 .../Framework/GraphQl/Type/Definition/IntType.php      | 10 +++++-----
 .../Framework/GraphQl/Type/Definition/StringType.php   | 10 +++++-----
 .../Framework/GraphQlSchemaStitching/GraphQlReader.php |  1 -
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
index 4d465818aa9ec..678a12b18bec9 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
@@ -45,18 +45,18 @@ public function parseValue($value): float
     public function parseLiteral(Node $valueNode, ?array $variables = null): float
     {
         try {
-            if (
-                $valueNode instanceof ValueNode
+            if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof FloatValueNode)
                 && !($valueNode instanceof IntValueNode)
-                && isset($valueNode->value)
-            ) {
+                && isset($valueNode->value))
+            {
                 $valueNode = new FloatValueNode([
                     'value' => (string)$this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc
                 ]);
             }
         } catch (Exception $e) {
+            // If parsing fails let it go through the regular method to throw the expected error
         }
         return parent::parseLiteral($valueNode, $variables);
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
index 93654120f7be5..261c335fc53a9 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
@@ -16,7 +16,7 @@
 /**
  * Replacement for the IntType definition that can typecast non-numeric values for backwards compatibility
  */
-class IntType extends \GraphQl\Type\Definition\IntType
+class IntType extends \GraphQL\Type\Definition\IntType
 {
     /**
      * Try to typecast valid values before running the native validations
@@ -44,17 +44,17 @@ public function parseValue($value): int
     public function parseLiteral(Node $valueNode, ?array $variables = null): int
     {
         try {
-            if (
-                $valueNode instanceof ValueNode
+            if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof IntValueNode)
-                && isset($valueNode->value)
-            ) {
+                && isset($valueNode->value))
+            {
                 $valueNode = new IntValueNode([
                     'value' => (string)$this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc
                 ]);
             }
         } catch (Exception $e) {
+            // If parsing fails let it go through the regular method to throw the expected error
         }
         return parent::parseLiteral($valueNode, $variables);
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
index c0b5b9b9a38f5..7cb48ff85949f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
@@ -16,7 +16,7 @@
 /**
  * Replacement for the StringType definition that can typecast non-string values for backwards compatibility
  */
-class StringType extends \GraphQl\Type\Definition\StringType
+class StringType extends \GraphQL\Type\Definition\StringType
 {
     /**
      * Try to typecast valid values before running the native validations
@@ -44,17 +44,17 @@ public function parseValue($value): string
     public function parseLiteral(Node $valueNode, ?array $variables = null): string
     {
         try {
-            if (
-                $valueNode instanceof ValueNode
+            if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof StringValueNode)
-                && isset($valueNode->value)
-            ) {
+                && isset($valueNode->value))
+            {
                 $valueNode = new StringValueNode([
                     'value' => $this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc
                 ]);
             }
         } catch (Exception $e) {
+            // If parsing fails let it go through the regular method to throw the expected error
         }
         return parent::parseLiteral($valueNode, $variables);
     }
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 61ca2be53ea3e..2ccef39af793c 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -350,7 +350,6 @@ private function addModuleNameToTypes(array $source, string $filePath): array
         return $source;
     }
 
-
     /**
      * Replace the standard type definitions with ones that know how to cast input values
      */

From 8a399707bdf88f95b68ad7d0d2e924ecf2071f42 Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Wed, 22 Sep 2021 15:24:39 -0400
Subject: [PATCH 17/27] Fixing static test failures

---
 .../Magento/Framework/GraphQl/Type/Definition/FloatType.php   | 4 ++--
 .../Magento/Framework/GraphQl/Type/Definition/IntType.php     | 4 ++--
 .../Magento/Framework/GraphQl/Type/Definition/StringType.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
index 678a12b18bec9..fccd3502a25d6 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
@@ -41,6 +41,7 @@ public function parseValue($value): float
      * @param array|null $variables
      * @return float
      * @throws Exception
+     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): float
     {
@@ -48,8 +49,7 @@ public function parseLiteral(Node $valueNode, ?array $variables = null): float
             if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof FloatValueNode)
                 && !($valueNode instanceof IntValueNode)
-                && isset($valueNode->value))
-            {
+                && isset($valueNode->value)) {
                 $valueNode = new FloatValueNode([
                     'value' => (string)$this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
index 261c335fc53a9..1f31a0f62ee30 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
@@ -40,14 +40,14 @@ public function parseValue($value): int
      * @param array|null $variables
      * @return int
      * @throws Exception
+     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): int
     {
         try {
             if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof IntValueNode)
-                && isset($valueNode->value))
-            {
+                && isset($valueNode->value)) {
                 $valueNode = new IntValueNode([
                     'value' => (string)$this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
index 7cb48ff85949f..f412990a996b3 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
@@ -40,14 +40,14 @@ public function parseValue($value): string
      * @param array|null $variables
      * @return string
      * @throws Exception
+     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): string
     {
         try {
             if ($valueNode instanceof ValueNode
                 && !($valueNode instanceof StringValueNode)
-                && isset($valueNode->value))
-            {
+                && isset($valueNode->value)) {
                 $valueNode = new StringValueNode([
                     'value' => $this->parseValue($valueNode->value),
                     'loc' => $valueNode->loc

From 7a8b143dda7df006c4d1cf797120b3273a2dd612 Mon Sep 17 00:00:00 2001
From: dthampy <dthampy@adobe.com>
Date: Wed, 22 Sep 2021 17:49:35 -0500
Subject: [PATCH 18/27] PWA-2137: [GraphQL] Need to bypass webonyx type
 validation

- tests
---
 .../GraphQl/GraphQlTypeValidationTest.php     | 271 ++++++++++++++++++
 .../simple_product_with_numeric_sku.php       |  45 +++
 ...mple_product_with_numeric_sku_rollback.php |  31 ++
 3 files changed, 347 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
new file mode 100644
index 0000000000000..7cc7794aef7f3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GraphQlTypeValidationTest extends GraphQlAbstract
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     *
+     * Tests that field expecting an Int type ; but Float is provided
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     */
+    public function testIntegerExpectedWhenFloatProvided()
+    {
+        $query
+            = <<<'QUERY'
+query GetProductsQuery($pageSize: Int, $filterInput: ProductAttributeFilterInput, $currentPage:Int ) {
+  products(
+    filter: $filterInput
+    pageSize: $pageSize
+    currentPage: $currentPage
+
+  ) {
+    items {
+      sku
+      name
+     id
+    }
+  }
+}
+QUERY;
+
+        $variables = [
+
+            'filterInput' => [
+                'sku' => [
+                    'eq' => 'simple_product',
+                ],
+            ],
+            'pageSize' => 1,
+            'currentPage' => 1.1
+        ];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Variable "$currentPage" got invalid value 1.1; Expected type Int; Int cannot represent non-integer value: 1.1');
+        $this->graphQlQuery($query, $variables);
+    }
+
+    /**
+     * Tests that field expects an Float type ; but String is provided
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     */
+    public function testFloatExpectedWhenStringProvided()
+    {
+        $sku = 'simple_product';
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get($sku, false, null, true);
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->addProductsToCart();
+        $variables = [
+            'cartId' => $cartId,
+            'sku' => $sku,
+            'quantity' => '1.9'
+        ];
+        $response = $this->graphQlMutation($query, $variables);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertArrayHasKey('addProductsToCart', $response);
+        $this->assertCount(1, $response['addProductsToCart']['cart']['items']);
+        $this->assertEquals($product->getSku(), $response['addProductsToCart']['cart']['items'][0]['product']['sku']);
+        $this->assertEquals(1.9, $response['addProductsToCart']['cart']['items'][0]['quantity']);
+    }
+
+    /**
+     *  Verify that query is resolved even when field expecting an Int is provided with String type data
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testIntegerExpectedWhenStringProvided()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quantity = 5;
+        $itemId = $this->getCartItemId($cartId);
+        $query
+            = <<<'MUTATION'
+mutation updateItemQuantity($cartId: String!, $itemId: Int!, $quantity: Float!)
+{
+  updateCartItems(input:
+    {cart_id: $cartId,
+      cart_items:
+      [
+        {cart_item_id: $itemId,
+        quantity: $quantity}]}
+  )
+  {
+    cart
+    {
+      id
+      items {id product {sku id } quantity}
+    }
+  }
+}
+MUTATION;
+
+        // $itemId expects an integer type, but a string value is provided
+        $variables = [
+            'cartId' => $cartId,
+            'itemId'=> "{$itemId}",
+             'quantity'=> $quantity
+        ];
+        $response = $this->graphQlMutation($query, $variables);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertCount(1, $response['updateCartItems']['cart']['items']);
+        $this->assertEquals('simple_product', $response['updateCartItems']['cart']['items'][0]['product']['sku']);
+        $this->assertEquals(5, $response['updateCartItems']['cart']['items'][0]['quantity']);
+        $this->assertEquals($itemId, $response['updateCartItems']['cart']['items'][0]['id']);
+    }
+
+    /**
+     * Verify that query doesn't return error when an integer is passed for a field where string is expected
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     */
+    public function testStringExpectedWhenFloatProvided()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->addProductsToCart();
+
+        // sku is expecting a string ; but an float  s given.
+        // And quantity is expecting a float, but value is passed as string
+        $variables = [
+            'cartId' => $cartId,
+            'sku' => 123.78,
+            'quantity' => '5.60'
+        ];
+        $response = $this->graphQlMutation($query, $variables);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertArrayHasKey('addProductsToCart', $response);
+        $this->assertCount(1, $response['addProductsToCart']['cart']['items']);
+        $this->assertEquals('123.78', $response['addProductsToCart']['cart']['items'][0]['product']['sku']);
+        $this->assertEquals(5.60, $response['addProductsToCart']['cart']['items'][0]['quantity']);
+    }
+
+    /**
+     * Verify that query doesn't return error when an integer is passed for a field where string is expected
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     */
+    public function testStringExpectedWhenArrayProvided()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->addProductsToCart();
+
+        // sku is expecting a string ; but an array is passed.
+        // And quantity is expecting a float, but value is passed as string
+        $variables = [
+            'cartId' => $cartId,
+            'sku' => ['123.78'],
+            'quantity' => '5.60'
+        ];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Variable "$sku" got invalid value ["123.78"]; Expected type String; String cannot represent a non string value: ["123.78"]');
+        $this->graphQlMutation($query, $variables);
+    }
+
+    /**
+     * Verify that query doesn't return error when an integer is passed for a field where string is expected
+     *
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     */
+    public function testFloatExpectedWhenNonNumericStringProvided()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->addProductsToCart();
+
+        //  quantity is expecting a float, but a non-numeric string is passed
+        $variables = [
+            'cartId' => $cartId,
+            'sku' => '123.78',
+            'quantity' => 'ten'
+        ];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Variable "$quantity" got invalid value "ten"; Expected type Float; Float cannot represent non numeric value: ten');
+        $this->graphQlMutation($query, $variables);
+    }
+
+    /**
+     *  Query the cart to get the cart item id
+     *
+     * @param string $cartId
+     * @return string
+     * @throws \Exception
+     */
+    private function getCartItemId(string $cartId): string
+    {
+        $cartQuery = <<<QUERY
+{
+  cart(cart_id: "$cartId") {
+    id
+    items {
+      id
+    }
+  }
+}
+QUERY;
+        $result = $this->graphQlQuery($cartQuery);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['cart']['items']);
+        return $result['cart']['items'][0]['id'];
+    }
+
+    /**
+     * @return string
+     */
+    private function addProductsToCart():string
+    {
+        return <<<'MUTATION'
+mutation AddItemsToCart($cartId: String!, $sku: String!, $quantity: Float!)
+{
+  addProductsToCart (
+     cartId:$cartId
+     cartItems:[
+      {
+        sku:$sku
+        quantity:$quantity
+    }]
+  )
+  {
+    cart {
+      id
+      total_quantity
+      items { product {sku id } quantity}
+    }
+  }
+}
+MUTATION;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
new file mode 100644
index 0000000000000..4d5132da2e239
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productFactory->create();
+$productData = [
+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+    ProductInterface::ATTRIBUTE_SET_ID => 4,
+    ProductInterface::SKU => '123.78',
+    ProductInterface::NAME => 'Simple 123',
+    ProductInterface::PRICE => 10,
+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+    ProductInterface::STATUS => Status::STATUS_ENABLED,
+];
+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
+/** Out of interface */
+$product
+    ->setWebsiteIds([1])
+    ->setStockData([
+        'qty' => 85.5,
+        'is_in_stock' => true,
+        'manage_stock' => true,
+        'is_qty_decimal' => true
+    ]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku_rollback.php
new file mode 100644
index 0000000000000..bcdc746ab85c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_with_numeric_sku_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$currentArea = $registry->registry('isSecureArea');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('123.78');
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    /**
+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+     */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', $currentArea);

From 0941fc9322a95fa1fab91a805f80f1cd8420d92d Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Thu, 23 Sep 2021 11:26:49 -0400
Subject: [PATCH 19/27] Fixing static test failures

---
 .../Magento/Framework/GraphQl/Type/Definition/FloatType.php  | 5 +----
 .../Magento/Framework/GraphQl/Type/Definition/IntType.php    | 5 +----
 .../Magento/Framework/GraphQl/Type/Definition/StringType.php | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
index fccd3502a25d6..fbdc3a8c7c7b5 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/FloatType.php
@@ -41,7 +41,6 @@ public function parseValue($value): float
      * @param array|null $variables
      * @return float
      * @throws Exception
-     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): float
     {
@@ -55,9 +54,7 @@ public function parseLiteral(Node $valueNode, ?array $variables = null): float
                     'loc' => $valueNode->loc
                 ]);
             }
-        } catch (Exception $e) {
-            // If parsing fails let it go through the regular method to throw the expected error
-        }
+        } catch (Exception $e) {} // @codingStandardsIgnoreLine
         return parent::parseLiteral($valueNode, $variables);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
index 1f31a0f62ee30..ff07d42748038 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/IntType.php
@@ -40,7 +40,6 @@ public function parseValue($value): int
      * @param array|null $variables
      * @return int
      * @throws Exception
-     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): int
     {
@@ -53,9 +52,7 @@ public function parseLiteral(Node $valueNode, ?array $variables = null): int
                     'loc' => $valueNode->loc
                 ]);
             }
-        } catch (Exception $e) {
-            // If parsing fails let it go through the regular method to throw the expected error
-        }
+        } catch (Exception $e) {} // @codingStandardsIgnoreLine
         return parent::parseLiteral($valueNode, $variables);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
index f412990a996b3..b891a0044a64d 100644
--- a/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Type/Definition/StringType.php
@@ -40,7 +40,6 @@ public function parseValue($value): string
      * @param array|null $variables
      * @return string
      * @throws Exception
-     * @SuppressWarnings(PHPMD.EmptyCatchBlock)
      */
     public function parseLiteral(Node $valueNode, ?array $variables = null): string
     {
@@ -53,9 +52,7 @@ public function parseLiteral(Node $valueNode, ?array $variables = null): string
                     'loc' => $valueNode->loc
                 ]);
             }
-        } catch (Exception $e) {
-            // If parsing fails let it go through the regular method to throw the expected error
-        }
+        } catch (Exception $e) {} // @codingStandardsIgnoreLine
         return parent::parseLiteral($valueNode, $variables);
     }
 }

From a764f4d654a0d34f4c96da57cabc46f85e6f9553 Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <shmyheli@adobe.com>
Date: Mon, 4 Oct 2021 08:18:15 -0500
Subject: [PATCH 20/27] B2B-1861: [Test] s3 - Refactor WebAPI tests to add
 support for Remote Storage

---
 .../Customer/Api/AccountManagementCustomAttributesTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
index 8387ca32004e9..4ca81c59c6704 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
@@ -186,7 +186,7 @@ protected function verifyImageAttribute($customAttributeArray, $expectedFileName
                 $this->assertStringContainsString($expectedFileName, $customAttribute[AttributeValue::VALUE]);
                 $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
                 $customerMediaPath = $mediaDirectory->getAbsolutePath(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-                $imageAttributeFound = file_exists($customerMediaPath . $customAttribute[AttributeValue::VALUE]);
+                $imageAttributeFound = $mediaDirectory->getDriver()->isExists($customerMediaPath . $customAttribute[AttributeValue::VALUE]);
                 $this->assertTrue($imageAttributeFound, 'Expected file was not created');
             }
         }

From ab043eb2267e8bbc39a2b2d0295c6e3bedbf7280 Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <shmyheli@adobe.com>
Date: Mon, 4 Oct 2021 16:05:18 -0500
Subject: [PATCH 21/27] B2B-1861: [Test] s3 - Refactor WebAPI tests to add
 support for Remote Storage

- fix  configurable_products_with_two_attributes_combination.php  fixture
---
 ...nfigurable_products_with_two_attributes_combination.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
index f26e39ca8e2a2..dbf6ea14b7a50 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
@@ -51,7 +51,6 @@
 
 /** @var WriteInterface $mediaDirectory */
 $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-$mediaPath = $mediaDirectory->getAbsolutePath();
 $baseTmpMediaPath = $config->getBaseTmpMediaPath();
 $mediaDirectory->create($baseTmpMediaPath);
 
@@ -65,9 +64,9 @@
 $associatedProductIds = [];
 $firstAttributeValues =  [];
 $secondAttributeValues = [];
-$testImagePath = __DIR__ . '/magento_image.jpg';
-$mediaImage = $mediaPath . '/' . $baseTmpMediaPath . '/magento_image.jpg';
-copy($testImagePath, $mediaImage);
+
+$mediaImage = $mediaDirectory->getAbsolutePath($baseTmpMediaPath . DIRECTORY_SEPARATOR . 'magento_image.jpg');
+$result = $mediaDirectory->getDriver()->filePutContents($mediaImage, file_get_contents(__DIR__ . '/magento_image.jpg'));
 
 array_shift($firstAttributeOptions);
 array_shift($secondAttributeOptions);

From 42281797cfb507ae42358676e69481f9aee479ca Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <shmyheli@adobe.com>
Date: Mon, 4 Oct 2021 16:12:46 -0500
Subject: [PATCH 22/27] B2B-1861: [Test] s3 - Refactor WebAPI tests to add
 support for Remote Storage

- fix  configurable_products_with_two_attributes_combination.php  fixture
---
 .../configurable_products_with_two_attributes_combination.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
index dbf6ea14b7a50..0cbd423acbe7c 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
@@ -65,8 +65,9 @@
 $firstAttributeValues =  [];
 $secondAttributeValues = [];
 
+$testImagePath = __DIR__ . '/magento_image.jpg';
 $mediaImage = $mediaDirectory->getAbsolutePath($baseTmpMediaPath . DIRECTORY_SEPARATOR . 'magento_image.jpg');
-$result = $mediaDirectory->getDriver()->filePutContents($mediaImage, file_get_contents(__DIR__ . '/magento_image.jpg'));
+$result = $mediaDirectory->getDriver()->filePutContents($mediaImage, file_get_contents($testImagePath));
 
 array_shift($firstAttributeOptions);
 array_shift($secondAttributeOptions);

From 59d8f9454f15f510c50b61d7eb3436fcdc48cbbd Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Tue, 5 Oct 2021 16:22:50 -0500
Subject: [PATCH 23/27] PWA-2137: [GraphQL] Need to bypass webonyx type
 validation

 - fix failing tests
---
 .../Framework/GraphQl/GraphQlConfigTest.php   | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
index f74d96bcc42a3..9d4befe244f02 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
@@ -23,16 +23,14 @@
  */
 class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
 {
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
    /** @var \Magento\Framework\GraphQl\Config  */
     private $model;
 
-    protected function setUp(): void
-    {
-        /** @var ObjectManagerInterface $objectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-       /** @var Cache $cache */
-        $cache = $objectManager->get(Cache::class);
-        $cache->clean();
+    public function __construct() {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
@@ -43,21 +41,31 @@ protected function setUp(): void
             $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
-        $graphQlReader = $objectManager->create(
+        $graphQlReader = $this->objectManager->create(
             \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
             ['fileResolver' => $fileResolverMock]
         );
-        $reader = $objectManager->create(
-            // phpstan:ignore
+        $reader = $this->objectManager->create(
+        // phpstan:ignore
             \Magento\Framework\GraphQlSchemaStitching\Reader::class,
             ['readers' => ['graphql_reader' => $graphQlReader]]
         );
-        $data = $objectManager->create(
-            // phpstan:ignore
-            \Magento\Framework\GraphQl\Config\Data ::class,
+        $data = $this->objectManager->create(
+        // phpstan:ignore
+            \Magento\Framework\GraphQl\Config\Data::class,
             ['reader' => $reader]
         );
-         $this->model = $objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
+        $this->model = $this->objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
+        parent::__construct();
+    }
+
+    protected function setUp(): void
+    {
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Cache $cache */
+        $cache = $objectManager->get(Cache::class);
+        $cache->clean();
     }
 
     /**
@@ -87,7 +95,7 @@ public function testGraphQlTypeAndFieldConfigStructure()
                 ]
             ];
             $this->assertResponseFields($expectedOutputArray['Query']['fields'][$fieldKey], $fieldAssertionMap);
-            /** @var \Magento\Framework\GraphQl\Config\Element\Argument $queryFieldArguments */
+            /** @var \Magento\Framework\GraphQl\Config\Element\Argument[] $queryFieldArguments */
             $queryFieldArguments = $queryFields[$fieldKey]->getArguments();
             foreach (array_keys($queryFieldArguments) as $argumentKey) {
                 $argumentAssertionMap = [
@@ -121,7 +129,7 @@ public function testGraphQlEnumTypeConfigStructure()
         $queryEnum = 'PriceAdjustmentDescriptionEnum';
         /** @var \Magento\Framework\GraphQl\Config\Element\Enum $outputEnum */
         $outputEnum = $this->model->getConfigElement($queryEnum);
-        /** @var EnumValue $outputEnumValues */
+        /** @var EnumValue[] $outputEnumValues */
         $outputEnumValues = $outputEnum->getValues();
         $expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
         $this->assertEquals($outputEnum->getName(), $queryEnum);
@@ -154,7 +162,7 @@ public function testGraphQlTypeThatImplementsInterface()
         $expectedOutputArray = require __DIR__ . '/_files/query_array_output.php';
         $this->assertEquals($outputInterface->getName(), $typeThatImplements);
         $outputInterfaceValues = $outputInterface->getInterfaces();
-        /** @var \Magento\Framework\GraphQl\Config\Element\Field $outputInterfaceFields */
+        /** @var \Magento\Framework\GraphQl\Config\Element\Field[] $outputInterfaceFields */
         $outputInterfaceFields =$outputInterface->getFields();
         foreach (array_keys($outputInterfaceValues) as $outputInterfaceValue) {
             $this->assertEquals(

From 3be3912248f838dcc359cf7acd6d145506c40494 Mon Sep 17 00:00:00 2001
From: Paras Sood <paras89@live.com>
Date: Wed, 6 Oct 2021 12:02:54 +0100
Subject: [PATCH 24/27] 32996 - fix static test

---
 app/code/Magento/Directory/Model/RegionProvider.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Directory/Model/RegionProvider.php b/app/code/Magento/Directory/Model/RegionProvider.php
index db9484a5ee3bd..00141bf036598 100644
--- a/app/code/Magento/Directory/Model/RegionProvider.php
+++ b/app/code/Magento/Directory/Model/RegionProvider.php
@@ -11,6 +11,9 @@
 
 class RegionProvider
 {
+    /**
+     * @var RegionsArray
+     */
     private $regions;
     /**
      * @var DataHelper

From bd0c567b024b78e9a0c95b004d8b99a080b41b55 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Wed, 6 Oct 2021 09:47:08 -0500
Subject: [PATCH 25/27] PWA-2137: [GraphQL] Need to bypass webonyx type
 validation

 - revert test changes
 - prevent standard types from being overridden more than once
---
 .../Framework/GraphQl/GraphQlConfigTest.php   | 50 ++++++++-----------
 .../GraphQlSchemaStitching/GraphQlReader.php  | 21 +++++---
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
index 9d4befe244f02..4308e2c1e6141 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
@@ -23,14 +23,16 @@
  */
 class GraphQlConfigTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var ObjectManagerInterface */
-    private $objectManager;
-
-   /** @var \Magento\Framework\GraphQl\Config  */
+    /** @var \Magento\Framework\GraphQl\Config  */
     private $model;
 
-    public function __construct() {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    protected function setUp(): void
+    {
+        /** @var ObjectManagerInterface $objectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Cache $cache */
+        $cache = $objectManager->get(Cache::class);
+        $cache->clean();
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
@@ -41,31 +43,21 @@ public function __construct() {
             $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
-        $graphQlReader = $this->objectManager->create(
+        $graphQlReader = $objectManager->create(
             \Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class,
             ['fileResolver' => $fileResolverMock]
         );
-        $reader = $this->objectManager->create(
+        $reader = $objectManager->create(
         // phpstan:ignore
             \Magento\Framework\GraphQlSchemaStitching\Reader::class,
             ['readers' => ['graphql_reader' => $graphQlReader]]
         );
-        $data = $this->objectManager->create(
+        $data = $objectManager->create(
         // phpstan:ignore
             \Magento\Framework\GraphQl\Config\Data::class,
             ['reader' => $reader]
         );
-        $this->model = $this->objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
-        parent::__construct();
-    }
-
-    protected function setUp(): void
-    {
-        /** @var ObjectManagerInterface $objectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var Cache $cache */
-        $cache = $objectManager->get(Cache::class);
-        $cache->clean();
+        $this->model = $objectManager->create(\Magento\Framework\GraphQl\Config::class, ['data' =>$data]);
     }
 
     /**
@@ -99,15 +91,15 @@ public function testGraphQlTypeAndFieldConfigStructure()
             $queryFieldArguments = $queryFields[$fieldKey]->getArguments();
             foreach (array_keys($queryFieldArguments) as $argumentKey) {
                 $argumentAssertionMap = [
-                   ['response_field' => 'name', 'expected_value' => $queryFieldArguments[$argumentKey]->getName()],
-                   ['response_field' => 'type', 'expected_value' => $queryFieldArguments[$argumentKey]->getTypeName()],
-                   ['response_field' => 'description', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->getDescription()],
-                   ['response_field' => 'required', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->isRequired()],
-                   ['response_field' => 'isList', 'expected_value' => $queryFieldArguments[$argumentKey]->isList()],
-                   ['response_field' => 'itemsRequired', 'expected_value' => $queryFieldArguments[$argumentKey]
-                       ->areItemsRequired()]
+                    ['response_field' => 'name', 'expected_value' => $queryFieldArguments[$argumentKey]->getName()],
+                    ['response_field' => 'type', 'expected_value' => $queryFieldArguments[$argumentKey]->getTypeName()],
+                    ['response_field' => 'description', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->getDescription()],
+                    ['response_field' => 'required', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->isRequired()],
+                    ['response_field' => 'isList', 'expected_value' => $queryFieldArguments[$argumentKey]->isList()],
+                    ['response_field' => 'itemsRequired', 'expected_value' => $queryFieldArguments[$argumentKey]
+                        ->areItemsRequired()]
                 ];
                 $this->assertResponseFields(
                     $expectedOutputArray['Query']['fields'][$fieldKey]['arguments'][$argumentKey],
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 2ccef39af793c..0f86e794a153f 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -59,6 +59,11 @@ class GraphQlReader implements ReaderInterface
      */
     private static $componentRegistrar;
 
+    /**
+     * @var boolean
+     */
+    private static $typesOverridden = false;
+
     /**
      * @param FileResolverInterface $fileResolver
      * @param TypeReaderComposite $typeReader
@@ -355,12 +360,16 @@ private function addModuleNameToTypes(array $source, string $filePath): array
      */
     private function overrideStandardGraphQLTypes(): void
     {
-        $standardTypes = GraphQLType::getStandardTypes();
+        if (!self::$typesOverridden) {
+            $standardTypes = GraphQLType::getStandardTypes();
 
-        GraphQL::overrideStandardTypes([
-            GraphQLType::INT => new IntType($standardTypes[GraphQLType::INT]->config),
-            GraphQLType::FLOAT => new FloatType($standardTypes[GraphQLType::FLOAT]->config),
-            GraphQLType::STRING => new StringType($standardTypes[GraphQLType::STRING]->config)
-        ]);
+            GraphQL::overrideStandardTypes([
+                GraphQLType::INT => new IntType($standardTypes[GraphQLType::INT]->config),
+                GraphQLType::FLOAT => new FloatType($standardTypes[GraphQLType::FLOAT]->config),
+                GraphQLType::STRING => new StringType($standardTypes[GraphQLType::STRING]->config)
+            ]);
+
+            self::$typesOverridden = true;
+        }
     }
 }

From 6a28e711f849153529b9f761da84c15b87202202 Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <shmyheli@adobe.com>
Date: Wed, 6 Oct 2021 11:50:52 -0500
Subject: [PATCH 26/27] B2B-1861: [Test] s3 - Refactor WebAPI tests to add
 support for Remote Storage

---
 .../Customer/Api/AccountManagementCustomAttributesTest.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
index 4ca81c59c6704..e9bc28d0c0f83 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php
@@ -186,7 +186,9 @@ protected function verifyImageAttribute($customAttributeArray, $expectedFileName
                 $this->assertStringContainsString($expectedFileName, $customAttribute[AttributeValue::VALUE]);
                 $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
                 $customerMediaPath = $mediaDirectory->getAbsolutePath(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
-                $imageAttributeFound = $mediaDirectory->getDriver()->isExists($customerMediaPath . $customAttribute[AttributeValue::VALUE]);
+                $imageAttributeFound = $mediaDirectory->getDriver()->isExists(
+                    $customerMediaPath . $customAttribute[AttributeValue::VALUE]
+                );
                 $this->assertTrue($imageAttributeFound, 'Expected file was not created');
             }
         }

From 62d42614a33d54bb97a0431e35fa0245ed4293ae Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Wed, 6 Oct 2021 15:26:32 -0500
Subject: [PATCH 27/27] PWA-2137: [GraphQL] Need to bypass webonyx type
 validation

 - fix static failures
---
 .../Magento/GraphQl/GraphQlTypeValidationTest.php        | 9 ++++++---
 .../Framework/GraphQlSchemaStitching/GraphQlReader.php   | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
index 7cc7794aef7f3..01597f23b49e4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlTypeValidationTest.php
@@ -68,7 +68,8 @@ public function testIntegerExpectedWhenFloatProvided()
             'currentPage' => 1.1
         ];
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Variable "$currentPage" got invalid value 1.1; Expected type Int; Int cannot represent non-integer value: 1.1');
+        $this->expectExceptionMessage('Variable "$currentPage" got invalid value 1.1; Expected type Int; ' .
+            'Int cannot represent non-integer value: 1.1');
         $this->graphQlQuery($query, $variables);
     }
 
@@ -191,7 +192,8 @@ public function testStringExpectedWhenArrayProvided()
             'quantity' => '5.60'
         ];
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Variable "$sku" got invalid value ["123.78"]; Expected type String; String cannot represent a non string value: ["123.78"]');
+        $this->expectExceptionMessage('Variable "$sku" got invalid value ["123.78"]; Expected type String; ' .
+            'String cannot represent a non string value: ["123.78"]');
         $this->graphQlMutation($query, $variables);
     }
 
@@ -213,7 +215,8 @@ public function testFloatExpectedWhenNonNumericStringProvided()
             'quantity' => 'ten'
         ];
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Variable "$quantity" got invalid value "ten"; Expected type Float; Float cannot represent non numeric value: ten');
+        $this->expectExceptionMessage('Variable "$quantity" got invalid value "ten"; Expected type Float; ' .
+            'Float cannot represent non numeric value: ten');
         $this->graphQlMutation($query, $variables);
     }
 
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 0f86e794a153f..33955c2054764 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -33,8 +33,6 @@ class GraphQlReader implements ReaderInterface
     public const GRAPHQL_INTERFACE = 'graphql_interface';
 
     /**
-     * File locator
-     *
      * @var FileResolverInterface
      */
     private $fileResolver;