From 243fd14b97512dff675c32f7a079276bd67bd387 Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Wed, 23 Dec 2020 18:04:56 +0200
Subject: [PATCH 1/4] SalesSequence. The sales sequence profiles associated to
 storeview ID 1 should have as prefix 1 after new Magento setup

---
 .../SalesSequence/Setup/SequenceCreator.php   |   3 +-
 .../Integration/Setup/SequenceCreatorTest.php | 139 ++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php

diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
index 14df80224e2ce..db45ac9009968 100644
--- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
@@ -56,8 +56,9 @@ public function create()
     {
         $defaultStoreIds = [0, 1];
         foreach ($defaultStoreIds as $storeId) {
+            $prefix = $storeId === 1 ? $storeId : $this->sequenceConfig->get('prefix');
             foreach ($this->entityPool->getEntities() as $entityType) {
-                $this->sequenceBuilder->setPrefix($this->sequenceConfig->get('prefix'))
+                $this->sequenceBuilder->setPrefix($prefix)
                     ->setSuffix($this->sequenceConfig->get('suffix'))
                     ->setStartValue($this->sequenceConfig->get('startValue'))
                     ->setStoreId($storeId)
diff --git a/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
new file mode 100644
index 0000000000000..b39add163e55d
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesSequence\Test\Integration\Setup;
+
+use Magento\Framework\App\ResourceConnection as AppResource;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\SalesSequence\Model\Config as SequenceConfig;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\SalesSequence\Setup\SequenceCreator;
+use Magento\SalesSequence\Model\ResourceModel\Meta as MetaResource;
+use Magento\SalesSequence\Model\ResourceModel\Profile as ProfileResource;
+use Magento\SalesSequence\Model\EntityPool;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testing data from the sales_sequence_profile table for default stores
+ */
+class SequenceCreatorTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManger;
+
+    /**
+     * @var SequenceCreator
+     */
+    private $sequenceCreator;
+
+    /**
+     * @var EntityPool
+     */
+    private $entityPool;
+
+    /**
+     * @var MetaResource
+     */
+    private $sequenceMetaResource;
+
+    /**
+     * @var ProfileResource
+     */
+    private $sequenceProfileResource;
+
+    /**
+     * @var SequenceConfig
+     */
+    private $sequenceConfig;
+
+    /**
+     * @var AppResource
+     */
+    private $appResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManger = Bootstrap::getObjectManager();
+        $this->sequenceCreator = $this->objectManger->create(SequenceCreator::class);
+        $this->sequenceMetaResource = $this->objectManger->create(MetaResource::class);
+        $this->sequenceProfileResource = $this->objectManger->create(ProfileResource::class);
+        $this->entityPool = $this->objectManger->create(EntityPool::class);
+        $this->sequenceConfig = $this->objectManger->create(SequenceConfig::class);
+        $this->appResource = $this->objectManger->create(AppResource::class);
+    }
+
+    /**
+     * Testing data from the sales_sequence_profile table for default stores
+     *
+     * @param array $defaultStores
+     * @dataProvider defaultStoresDataProvider
+     */
+    public function testSalesSequenceProfileTableForDefaultStores(array $defaultStores): void
+    {
+        foreach ($defaultStores as $storeId) {
+            foreach ($this->entityPool->getEntities() as $entityType) {
+                $meta = $this->sequenceMetaResource->loadByEntityTypeAndStore($entityType, $storeId);
+                $profile = $this->sequenceProfileResource->loadActiveProfile($meta->getId());
+                $this->assertEquals($this->getSequenceTableName($entityType, $storeId), $meta->getSequenceTable());
+                $this->assertEquals($this->sequenceConfig->get('startValue'), $profile->getStartValue());
+                $this->assertEquals($this->sequenceConfig->get('suffix'), $profile->getSuffix());
+                $this->assertEquals($this->sequenceConfig->get('step'), $profile->getStep());
+                $this->assertEquals($this->sequenceConfig->get('warningValue'), $profile->getWarningValue());
+                $this->assertEquals($this->sequenceConfig->get('maxValue'), $profile->getMaxValue());
+
+                if ($storeId === 0) {
+                    $this->assertEquals(null, $profile->getPrefix());
+                } else {
+                    $this->assertNotNull($profile->getPrefix());
+                }
+            }
+        }
+    }
+
+    /**
+     * Default stores data provider
+     *
+     * @return array
+     */
+    public function defaultStoresDataProvider(): array
+    {
+        return [
+            [
+                'defaultStores' => [
+                    0,
+                    1
+                ]
+            ],
+        ];
+
+    }
+
+    /**
+     * Get sequence table name
+     *
+     * @param string $entityType
+     * @param int $storeId
+     *
+     * @return string
+     */
+    private function getSequenceTableName(string $entityType, int $storeId): string
+    {
+        return $this->appResource->getTableName(
+            sprintf(
+                'sequence_%s_%s',
+                $entityType,
+                $storeId
+            )
+        );
+    }
+}

From f75718bf1f80330636dc5b7376cb6b2bbf87212c Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Tue, 2 Feb 2021 17:43:46 +0200
Subject: [PATCH 2/4] Change comments in integration test

---
 .../Test/Integration/Setup/SequenceCreatorTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
index b39add163e55d..8fecf0e51ef5f 100644
--- a/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
+++ b/app/code/Magento/SalesSequence/Test/Integration/Setup/SequenceCreatorTest.php
@@ -19,7 +19,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Testing data from the sales_sequence_profile table for default stores
+ * Test default created store views sales sequences prefix.
  */
 class SequenceCreatorTest extends TestCase
 {
@@ -73,7 +73,7 @@ protected function setUp(): void
     }
 
     /**
-     * Testing data from the sales_sequence_profile table for default stores
+     * Test prefix for default created store views.
      *
      * @param array $defaultStores
      * @dataProvider defaultStoresDataProvider
@@ -101,7 +101,7 @@ public function testSalesSequenceProfileTableForDefaultStores(array $defaultStor
     }
 
     /**
-     * Default stores data provider
+     * Default store codes data provider
      *
      * @return array
      */

From acc9b81492287bf6cc7d6eaafdad380f6b40f618 Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Tue, 2 Feb 2021 17:51:31 +0200
Subject: [PATCH 3/4] Fixed Mftf tests

---
 ...ntPurchaseProductWithCustomOptionsTest.xml |  5 +++--
 ...OrderWithNewAddressesThatWasEditedTest.xml |  4 +++-
 ...rontRefreshPageDuringGuestCheckoutTest.xml |  4 +++-
 ...StorefrontGoToOrderViewPageActionGroup.xml | 22 +++++++++++++++++++
 ...fStorefrontIsOpenedViaCustomerViewTest.xml |  2 +-
 ...sMessageOrderCreatedByAdminActionGroup.xml |  5 +++--
 ...sMessageOrderCreatedByAdminActionGroup.xml |  3 ++-
 ...dminCheckingCreditMemoUpdateTotalsTest.xml | 10 ++++-----
 ...ifyOrderShipmentForDecimalQuantityTest.xml |  4 ++--
 9 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index dad3e05d81a53..17272a1672d52 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -169,8 +169,9 @@
         <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
 
         <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
-
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
+        <actionGroup ref="StorefrontGoToOrderViewPageActionGroup" stepKey="goToOrderViewPage">
+            <argument name="orderIncrementId" value="$grabOrderNumber" />
+        </actionGroup>
 
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index e09c2a3af2f3e..0fbc1e713fd0e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -86,7 +86,9 @@
         <see userInput="{{UK_Not_Default_Address.postcode}}"
              selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcode"/>
         <!--Order review page has address that was created during checkout-->
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
+        <actionGroup ref="StorefrontGoToOrderViewPageActionGroup" stepKey="goToOrderViewPage">
+            <argument name="orderIncrementId" value="$grabOrderNumber" />
+        </actionGroup>
         <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
              selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
         <see userInput="{{US_Address_TX_Default_Billing.street[0]}}"
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
index 99a9e0273430d..4be77baba1ffd 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
@@ -58,7 +58,9 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
 
         <!-- Order review page has address that was created during checkout -->
-        <amOnPage url="{{AdminOrderPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
         <waitForPageLoad stepKey="waitForCreatedOrderPage"/>
         <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}} {{CustomerAddressSimple.city}}, {{CustomerAddressSimple.state}}, {{CustomerAddressSimple.postcode}}" stepKey="checkShippingAddress"/>
     </test>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml
new file mode 100644
index 0000000000000..4ba070286efc3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontGoToOrderViewPageActionGroup">
+        <annotations>
+            <description>Navigate to storefront order view page</description>
+        </annotations>
+        <arguments>
+            <argument name="orderIncrementId" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="goToCustomerOrderHistoryPage" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderNumber(orderIncrementId)}}" stepKey="clickOrderView" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
index b975cf62765c1..abab474e7ab9e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest">
         <annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index bcf6fc96aa131..b6313018c679d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
+    <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" extends="FilterOrderGridByIdActionGroup">
         <annotations>
             <description>Assert Admin Order page contains message about Order created by a Store Administrator.
             </description>
@@ -18,7 +18,8 @@
             <argument name="adminUserFullName" type="string"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
+        <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="Order Placed by {{adminUserFullName}} using Login as Customer"
              stepKey="seeMessageOrderCreatedByAdmin"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index f40ea7f93c7a1..ef6596320adfa 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -17,7 +17,8 @@
             <argument name="orderId" type="string"/>
         </arguments>
 
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="amOnTheCustomerOrderHistoryPage"/>
+        <click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderNumber(orderId)}}" stepKey="goToOrderReviewPage" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
     </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
index 03dd8b28a624f..016af69cf629e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml
@@ -27,16 +27,16 @@
             <createData entity="CustomerCart" stepKey="createCustomerCart">
                 <requiredEntity createDataKey="createCustomer"/>
             </createData>
-    
+
             <createData entity="CustomerCartItem" stepKey="addCartItem">
                 <requiredEntity createDataKey="createCustomerCart"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-    
+
             <createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
                 <requiredEntity createDataKey="createCustomerCart"/>
             </createData>
-    
+
             <updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformation">
                 <requiredEntity createDataKey="createCustomerCart"/>
             </updateData>
@@ -64,9 +64,9 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="{$getOrderId}"/>
         </actionGroup>
-
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
         <actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
-            <argument name="orderId" value="{$getOrderId}"/>
+            <argument name="orderId" value="{$getOrderIdFromUrl}"/>
         </actionGroup>
         <fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
         <actionGroup ref="UpdateCreditMemoTotalsActionGroup" stepKey="updateCreditMemoTotals"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
index b086074132e85..58f9b4e68f406 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml
@@ -89,13 +89,13 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
-
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderId"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
 
         <actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage"/>
         <!--Step12. Go to Customer Order Shipment Page and Checking the correctness of displayed Qty Shipped -->
-        <amOnPage url="{{StorefrontCustomerOrderShipmentPage.url({$grabOrderNumber})}}" stepKey="amOnOrderShipmentPage"/>
+        <amOnPage url="{{StorefrontCustomerOrderShipmentPage.url({$getOrderId})}}" stepKey="amOnOrderShipmentPage"/>
         <waitForPageLoad time="30" stepKey="waitForOrderShipmentsPageLoad"/>
         <actionGroup ref="AssertStorefrontOrderShipmentsQtyShippedActionGroup" stepKey="verifyAssertOrderShipments">
             <argument name="expectedQtyShipped" value="2.14"/>

From a1f5e2f694f52507c29a74004677fcf0a5c9e27e Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Fri, 26 Mar 2021 14:52:17 +0200
Subject: [PATCH 4/4] Fixed
 StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest to
 compatibility with sequence prefix changing

---
 ...tPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
index 2351a6b1b2d5f..409558b417216 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml
@@ -114,7 +114,9 @@
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
         <!--Navigate to order details page in custom account-->
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
+        <actionGroup ref="StorefrontGoToOrderViewPageActionGroup" stepKey="goToOrderViewPage">
+            <argument name="orderIncrementId" value="$grabOrderNumber" />
+        </actionGroup>
         <!--Verify bundle order items details-->
         <see selector="{{StorefrontCustomerOrderSection.orderItemOptionLabel('2')}}" userInput="$$createFirstBundleOption.title$$" stepKey="seeOptionLabelInCustomerOrderItems"/>
         <see selector="{{StorefrontCustomerOrderSection.orderItemOptionValue('3')}}" userInput="1 x $$createFirstProduct.name$$ $9.00" stepKey="seeOptionValueInCustomerOrderItems"/>