Skip to content

Commit ed1d38b

Browse files
adamphhadamphh
authored
Merge branch '2.4-develop' into AC-6980_36407_Integration_not_secure_warning_showing_in_list_of_integration,_if_field_values_of_Callback_URL_and_Identity_link_URL_are_empty
2 parents 79d90b4 + 21a3692 commit ed1d38b

File tree

36 files changed

+622
-97
lines changed

36 files changed

+622
-97
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686

8787
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
8888

89-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90-
<see selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
89+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('1')}}" userInput="1 x $$SimpleProduct1.name$$ $10.00" stepKey="seeOptionValue1"/>
90+
<waitForText selector="{{StorefrontBundledSection.nthItemOptionsValue('2')}}" userInput="1 x $$SimpleProduct2.name$$ $15.00" stepKey="seeOptionValue2"/>
9191

9292
<openNewTab stepKey="openNewTab"/>
9393

@@ -115,12 +115,12 @@
115115
</actionGroup>
116116

117117
<click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
118-
118+
<waitForElementClickable selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="waitForUpdateCartButtonClickable" />
119119
<click selector="{{StorefrontProductInfoMainSection.updateCart}}" stepKey="clickUpdateCartButton"/>
120-
120+
<waitForElementClickable selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitForProceedToCheckoutClickable" />
121121
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
122122

123-
<see selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
123+
<waitForText selector="{{CheckoutHeaderSection.shippingMethodStep}}" userInput="Shipping" stepKey="checkShippingHeader"/>
124124

125125
</test>
126126
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
</before>
2525
<after>
2626
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
27+
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductGridPage" />
28+
<actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="deleteProducts" />
2729
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2830
</after>
2931

‎app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/AdminDeleteAllTermConditionsActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminDeleteAllTermConditionsActionGroup">
11+
<annotations>
12+
<description>Deletes all rows one by one on the 'Terms and Conditions' page.</description>
13+
</annotations>
14+
<waitForElementVisible selector="{{AdminLegacyDataGridFilterSection.clear}}" stepKey="waitForResetFilter"/>
15+
<click selector="{{AdminLegacyDataGridFilterSection.clear}}" stepKey="clickResetFilter"/>
16+
<waitForPageLoad stepKey="waitForGridReset"/>
17+
<helper class="Magento\CheckoutAgreements\Test\Mftf\Helper\CheckoutAgreementsHelpers" method="deleteAllTermConditionRows" stepKey="deleteAllTermConditionRows">
18+
<argument name="rowsToDelete">{{AdminTermGridSection.allTermRows}}</argument>
19+
<argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument>
20+
<argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument>
21+
<argument name="successMessage">You deleted the condition.</argument>
22+
<argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument>
23+
</helper>
24+
<waitForPageLoad stepKey="waitForGridLoad"/>
25+
<waitForText userInput="We couldn't find any records." selector="{{AdminTermGridSection.emptyGrid}}" stepKey="waitForEmptyGrid"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Helper/CheckoutAgreementsHelpers.php

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CheckoutAgreements\Test\Mftf\Helper;
9+
10+
use Facebook\WebDriver\WebDriverBy;
11+
use Magento\FunctionalTestingFramework\Helper\Helper;
12+
use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
13+
use Exception;
14+
15+
/**
16+
* Class for MFTF helpers for CheckoutAgreements module.
17+
*/
18+
class CheckoutAgreementsHelpers extends Helper
19+
{
20+
/**
21+
* Delete all term conditions one by one from the Terms & Conditions grid page.
22+
*
23+
* @param string $rowsToDelete
24+
* @param string $deleteButton
25+
* @param string $modalAcceptButton
26+
* @param string $successMessage
27+
* @param string $successMessageContainer
28+
*
29+
* @return void
30+
*/
31+
public function deleteAllTermConditionRows(
32+
string $rowsToDelete,
33+
string $deleteButton,
34+
string $modalAcceptButton,
35+
string $successMessage,
36+
string $successMessageContainer
37+
): void {
38+
try {
39+
/** @var MagentoWebDriver $magentoWebDriver */
40+
$magentoWebDriver = $this->getModule("\\" . MagentoWebDriver::class);
41+
$webDriver = $magentoWebDriver->webDriver;
42+
43+
$magentoWebDriver->waitForPageLoad(30);
44+
$rows = $webDriver->findElements(WebDriverBy::xpath($rowsToDelete));
45+
while (!empty($rows)) {
46+
$rows[0]->click();
47+
$magentoWebDriver->waitForPageLoad(30);
48+
$magentoWebDriver->waitForElementVisible($deleteButton, 10);
49+
$magentoWebDriver->click($deleteButton);
50+
$magentoWebDriver->waitForPageLoad(30);
51+
$magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
52+
$magentoWebDriver->click($modalAcceptButton);
53+
$magentoWebDriver->waitForPageLoad(60);
54+
$magentoWebDriver->waitForText($successMessage, 10, $successMessageContainer);
55+
$rows = $webDriver->findElements(WebDriverBy::xpath($rowsToDelete));
56+
}
57+
} catch (Exception $exception) {
58+
$this->fail($exception->getMessage());
59+
}
60+
}
61+
}

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Section/AdminTermGridSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@
1515
<element name="firstRowConditionName" type="text" selector=".data-grid>tbody>tr>td.col-name"/>
1616
<element name="firstRowConditionId" type="text" selector=".data-grid>tbody>tr>td.col-id.col-agreement_id"/>
1717
<element name="successMessage" type="text" selector=".message-success"/>
18+
<element name="allTermRows" type="block" selector="//table[@id='agreementGrid_table']//tbody//tr[not(contains(@class,'data-grid-tr-no-data'))]"/>
19+
<element name="emptyGrid" type="block" selector="//table[@id='agreementGrid_table']//tbody//tr[contains(@class,'data-grid-tr-no-data')]"/>
1820
</section>
1921
</sections>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveHtmlTermEntityTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3434

3535
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
36-
<actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
37-
<argument name="termName" value="{{activeHtmlTerm.name}}"/>
38-
</actionGroup>
39-
<actionGroup ref="AdminTermsConditionsDeleteTermByNameActionGroup" stepKey="deleteOpenedTerm"/>
36+
<actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
37+
<comment userInput="BIC workaround" stepKey="openTermToDelete"/>
38+
<comment userInput="BIC workaround" stepKey="deleteOpenedTerm"/>
4039

4140
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
4241
</after>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveTextTermEntityTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
<group value="mtf_migrated"/>
2121
</annotations>
2222
<after>
23-
<actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
24-
<argument name="termName" value="{{activeTextTerm.name}}"/>
25-
</actionGroup>
23+
<comment userInput="BIC workaround" stepKey="openTermToDelete"/>
2624
</after>
2725

2826
<actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateDisabledTextTermEntityTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3333

3434
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
35-
<actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
36-
<argument name="termName" value="{{disabledTextTerm.name}}"/>
37-
</actionGroup>
38-
<actionGroup ref="AdminTermsConditionsDeleteTermByNameActionGroup" stepKey="deleteOpenedTerm"/>
35+
<actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
36+
<comment userInput="BIC workaround" stepKey="openTermToDelete"/>
37+
<comment userInput="BIC workaround" stepKey="deleteOpenedTerm"/>
3938

4039
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
4140
</after>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateEnabledTextTermOnMultishippingEntityTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@
4141
<deleteData createDataKey="createdProduct2" stepKey="deletedProduct2"/>
4242

4343
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
44-
<actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
45-
<argument name="termName" value="{{activeTextTerm.name}}"/>
46-
</actionGroup>
47-
<actionGroup ref="AdminTermsConditionsDeleteTermByNameActionGroup" stepKey="deleteOpenedTerm"/>
44+
<actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
45+
<comment userInput="BIC workaround" stepKey="openTermToDelete"/>
46+
<comment userInput="BIC workaround" stepKey="deleteOpenedTerm"/>
4847

4948
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5049
</after>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminUpdateDisabledHtmlTermEntityTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3333

3434
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
35-
<actionGroup ref="AdminOpenEditPageTermsConditionsByNameActionGroup" stepKey="openTermToDelete">
36-
<argument name="termName" value="{{activeTextTerm.name}}"/>
37-
</actionGroup>
38-
<actionGroup ref="AdminTermsConditionsDeleteTermByNameActionGroup" stepKey="deleteOpenedTerm"/>
35+
<actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
36+
<comment userInput="BIC workaround" stepKey="openTermToDelete"/>
37+
<comment userInput="BIC workaround" stepKey="deleteOpenedTerm"/>
3938

4039
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
4140
</after>

0 commit comments

Comments
 (0)