Merge pull request #8576 from magento-gl/ACQE-5651-functional-mainline

okolesnyk · web-flow · commit 9e2eb996e4cf · 2023-11-08T10:40:31.000-06:00
Acqe 5651 functional mainline
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml
@@ -62,6 +62,7 @@
         <!-- Mouse Hover Product On Category Page-->
         <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverProduct"/>
         <!-- Select Add to cart-->
+        <waitForElementClickable selector="{{StorefrontCategoryMainSection.addToCartProductBySku($$simpleProductOne.sku$$)}}" stepKey="waitForAddToCartButton"/>
         <click selector="{{StorefrontCategoryMainSection.addToCartProductBySku($$simpleProductOne.sku$$)}}" stepKey="toCategory"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="wait"/>
         <!-- Assert the Error Message-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckBillingAddressInCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckBillingAddressInCheckoutActionGroup.xml
@@ -18,6 +18,7 @@
         </arguments>
 
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="waitForBillingAddressFirstNameVisible"/>
         <see userInput="{{customerVar.firstName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressFirstName"/>
         <see userInput="{{customerVar.lastName}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressLastName"/>
         <see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressStreet"/>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithErrorEntriesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithErrorEntriesTest.xml
@@ -40,7 +40,7 @@
             <argument name="importNoticeMessage" value="Created: 10, Updated: 0, Deleted: 0"/>
             <argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
         </actionGroup>
-        <see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10" stepKey="seeTenImportError"/>
+        <waitForText selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 10" stepKey="seeTenImportError"/>
 
         <!--Import products with "Stop on Error" and "Allowed Errors Count" equals 5-->
         <actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProductsWithAllowedErrorsCountFive">
@@ -52,7 +52,7 @@
             <argument name="importMessage" value="Maximum error count has been reached or system error is occurred!"/>
             <argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
         </actionGroup>
-        <see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6" stepKey="seeAboutFiveImportError"/>
+        <waitForText selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 6" stepKey="seeAboutFiveImportError"/>
 
         <!--Import products with "Stop on Error" and "Allowed Errors Count" equals 11-->
         <actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProductsWithAllowedErrorsCountEleven">
@@ -62,6 +62,6 @@
             <argument name="importNoticeMessage" value="Created: 0, Updated: 10, Deleted: 0"/>
             <argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
         </actionGroup>
-        <see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10" stepKey="seeAboutTenImportError"/>
+        <waitForText selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 10" stepKey="seeAboutTenImportError"/>
     </test>
 </tests>
diff --git a/app/code/Magento/OrderCancellation/Test/Mftf/Section/AdminOrderCancellationConfigSection.xml b/app/code/Magento/OrderCancellation/Test/Mftf/Section/AdminOrderCancellationConfigSection.xml
@@ -9,6 +9,7 @@
     <section name="AdminOrderCancellationConfigSection">
         <element name="valueForSalesCancellation" type="select" selector="#sales_cancellation_enabled"/>
         <element name="systemValueForSalesCancellation" type="checkbox" selector="#sales_cancellation_enabled_inherit"/>
+        <element name="salesCancellationHead" type="select" selector="#sales_cancellation-head"/>
         <element name="systemValueForSalesCancellationReasons" type="checkbox" selector="#sales_cancellation_reasons_inherit"/>
         <element name="deleteReasonRow" type="button" selector="#sales_cancellation_reasons #item{{row}} td.col-actions button.action-delete" parameterized="true"/>
         <element name="deleteFirstReason" type="button" selector="#sales_cancellation_reasons tbody tr:first-child td.col-actions button.action-delete" />
diff --git a/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationConfigTest.xml b/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationConfigTest.xml
@@ -24,8 +24,9 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminOrderCancellationConfigPage.url('#sales_cancellation-head')}}" stepKey="navigateToConfigurationPage"/>
+        <amOnPage url="{{AdminOrderCancellationConfigPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad"/>
+        <conditionalClick selector="{{AdminOrderCancellationConfigSection.salesCancellationHead}}" dependentSelector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellationReasons}}" visible="false"  stepKey="clickElementToExpand"/>
         <uncheckOption selector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellation}}" stepKey="uncheckUseSystemValue"/>
         <selectOption selector="{{AdminOrderCancellationConfigSection.valueForSalesCancellation}}" userInput="1" stepKey="valueForSalesCancellation"/>
         <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
diff --git a/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationReasonsConfigCreateEditTest.xml b/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationReasonsConfigCreateEditTest.xml
@@ -24,8 +24,9 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminOrderCancellationConfigPage.url('#sales_cancellation-head')}}" stepKey="navigateToConfigurationPage"/>
+        <amOnPage url="{{AdminOrderCancellationConfigPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad"/>
+        <conditionalClick selector="{{AdminOrderCancellationConfigSection.salesCancellationHead}}" dependentSelector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellationReasons}}" visible="false"  stepKey="clickElementToExpand"/>
         <uncheckOption selector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellationReasons}}" stepKey="uncheckUseSystemValue"/>
         <click selector="{{AdminOrderCancellationConfigSection.deleteFirstReason}}" stepKey="deleteDefaultReason"/>
         <fillField selector="{{AdminOrderCancellationConfigSection.editFirstReason}}" userInput="Modified reason" stepKey="editDefaultReason"/>
diff --git a/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationReasonsConfigRemoveAllTest.xml b/app/code/Magento/OrderCancellation/Test/Mftf/Test/AdminOrderCancellationReasonsConfigRemoveAllTest.xml
@@ -24,8 +24,9 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminOrderCancellationConfigPage.url('#sales_cancellation-head')}}" stepKey="navigateToConfigurationPage"/>
+        <amOnPage url="{{AdminOrderCancellationConfigPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad"/>
+        <conditionalClick selector="{{AdminOrderCancellationConfigSection.salesCancellationHead}}" dependentSelector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellationReasons}}" visible="false"  stepKey="clickElementToExpand"/>
         <uncheckOption selector="{{AdminOrderCancellationConfigSection.systemValueForSalesCancellationReasons}}" stepKey="uncheckUseSystemValue"/>
         <click selector="{{AdminOrderCancellationConfigSection.deleteFirstReason}}" stepKey="deleteDefaultReason1"/>
         <click selector="{{AdminOrderCancellationConfigSection.deleteFirstReason}}" stepKey="deleteDefaultReason2"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="storeView" defaultValue="customStore"/>
         </arguments>
-
+        <waitForElementClickable selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="waitForStoreViewSwitcher"/>
         <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
         <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
         <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
diff --git a/app/code/Magento/Translation/Test/Mftf/Section/InlineTranslationModeCheckoutSection.xml b/app/code/Magento/Translation/Test/Mftf/Section/InlineTranslationModeCheckoutSection.xml
@@ -12,7 +12,7 @@
         <!-- Shipping Step -->
         <element name="progressBarActive" type="text" selector=".opc-progress-bar ._active span"/>
         <element name="stepTitleShipping" type="text" selector="#shipping div.step-title"/>
-        <element name="buttonShippingHere" type="button" selector="button.action-select-shipping-item span"/>
+        <element name="buttonShippingHere" type="button" selector="div.shipping-address-item.not-selected-item button.action-select-shipping-item span"/>
         <element name="buttonNewAddress" type="button" selector=".new-address-popup button span"/>
         <element name="titleShippingMethod" type="text" selector=".checkout-shipping-method .step-title"/>
         <element name="buttonNext" type="button" selector="#shipping-method-buttons-container button.primary span"/>
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Quote\Model;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -85,6 +86,21 @@ class QuoteRepositoryTest extends TestCase
      */
     private $quote;
 
+    /**
+     * @var \Magento\Quote\Model\QuoteFactory
+     */
+    private $quoteFactorys;
+
+    /**
+     * @var \Magento\Store\Model\Store
+     */
+    private $store;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @inheritdoc
      */
@@ -101,6 +117,9 @@ protected function setUp(): void
         $this->addressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
         $this->quoteFactory = $this->objectManager->get(CartInterfaceFactory::class);
         $this->itemFactory = $this->objectManager->get(CartItemInterfaceFactory::class);
+        $this->quoteFactorys = $this->objectManager->get(\Magento\Quote\Model\QuoteFactory::class);
+        $this->store = $this->objectManager->get(\Magento\Store\Model\Store::class);
+        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -278,4 +297,88 @@ private function performAssertions(CartSearchResultsInterface $searchResult): vo
         $this->assertEquals($expectedExtensionAttributes['lastname'], $testAttribute->getLastName());
         $this->assertEquals($expectedExtensionAttributes['email'], $testAttribute->getEmail());
     }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product.php
+     * @magentoDbIsolation disabled
+     * @return void
+     * @throws \Exception
+     */
+    public function testDeleteAllQuotesOnStoreViewDeletion(): void
+    {
+        $storeData = [
+            [
+                'code' => 'store1',
+                'website_id' => 1,
+                'group_id' => 1,
+                'name' => 'Store 1',
+                'sort_order' => 0,
+                'is_active' => 1,
+            ],
+            [
+                'code' => 'store2',
+                'website_id' => 1,
+                'group_id' => 1,
+                'name' => 'Store 2',
+                'sort_order' => 1,
+                'is_active' => 1,
+            ],
+        ];
+
+        foreach ($storeData as $storeInfo) {
+            $this->objectManager->create(\Magento\Store\Model\Store::class)
+                ->setData($storeInfo)
+                ->save();
+        }
+
+        // Fetching the store id
+        $firstStoreId = $this->store->load('store1')->getId();
+        $secondStoreId = $this->store->load('store2')->getId();
+
+        // Create a quote for guest user with store id 2
+        $quote = $this->quoteFactorys->create();
+        $quote->setStoreId($firstStoreId);
+        $quote->save();
+
+        // Assert that quote is created successfully.
+        $this->assertNotNull($quote->getId());
+
+        // Create a quote for guest user with store id 3
+        $secondQuote = $this->quoteFactorys->create();
+        $secondQuote->setStoreId($secondStoreId);
+        $secondQuote->save();
+
+        // Assert that second quote is created successfully.
+        $this->assertNotNull($secondQuote->getId());
+
+        // load customer by id
+        $customer = $this->customerRepository->getById(1);
+
+        // Create a quote for customer with store id 3
+        $thirdQuote = $this->quoteFactorys->create();
+        $thirdQuote->setStoreId($secondStoreId);
+        $thirdQuote->setCustomer($customer);
+        $thirdQuote->save();
+
+        // Loading the second store from the data fixture
+        $this->store->load('store2', 'code');
+        /** @var \Magento\TestFramework\Helper\Bootstrap $registry */
+        $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\Registry::class
+        );
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        // Deleting the second store.
+        $this->store->delete();
+
+        // asserting that quote associated with guest user is also deleted when store is deleted
+        $afterDeletionQuote = $this->quoteFactorys->create()->load($secondQuote->getId());
+        $this->assertNull($afterDeletionQuote->getId());
+
+        // asserting that quote associated with customer is also deleted when store is deleted
+        $afterDeletionQuote = $this->quoteFactorys->create()->load($thirdQuote->getId());
+        $this->assertNull($afterDeletionQuote->getId());
+    }
 }
