Skip to content

Commit 4c44ddb

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into AC-12767-AC-12680
2 parents e4a8ab2 + 2990f74 commit 4c44ddb

9 files changed

+276
-44
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminVerifyCmsPageSelectMenuActionGroup.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
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="AdminVerifyCmsPageSelectMenuActionGroup">
11+
<arguments>
12+
<argument name="pageName" type="string" defaultValue="404 Not Found"/>
13+
</arguments>
14+
<annotations>
15+
<description>Goes to Admin CMS Page grid page. Validates that all of the select menu options are present.</description>
16+
</annotations>
17+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.select('pageName')}}" stepKey="waitForCMSPageListItem" />
18+
<click selector="{{CmsPagesPageActionsSection.select('pageName')}}" stepKey="clickSelect" />
19+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('pageName')}}" stepKey="waitForEditLink" />
20+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.preview('pageName')}}" stepKey="waitForPreviewLink" />
21+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.delete('pageName')}}" stepKey="waitForDeleteLink" />
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
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="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup">
11+
<annotations>
12+
<description>Goes to Admin CMS Page creation page. Validates that all of the Tiny MCE buttons are present.</description>
13+
</annotations>
14+
<waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
15+
<click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
16+
<waitForElementNotVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="tinyMCENotAvailable"/>
17+
<waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="waitForInsertWidget"/>
18+
<waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage"/>
19+
<waitForElementVisible selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="waitForInsertVariable"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsAcrossBrowserTabsTest.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsAcrossBrowserTabsTest">
11+
<annotations>
12+
<features value="Cms"/>
13+
<stories value="404 Not Found Page"/>
14+
<title value="WYSIWYG is presented for content if page for edit is opened in new browser tab"/>
15+
<description value="Testcase verifie WYSIWYG editor and tiny mce buttons for 404 not found page on browser tabs"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4119" />
18+
</annotations>
19+
<before>
20+
<!-- Enable WYSIWYG editor -->
21+
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
22+
<!-- Enable TinyMCE -->
23+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
29+
</after>
30+
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCmsPageGrid"/>
31+
<actionGroup ref="AdminVerifyCmsPageSelectMenuActionGroup" stepKey="verify404NotFoundPageSelectMenu"/>
32+
<click selector="{{CmsPagesPageActionsSection.edit('404 Not Found')}}" stepKey="clickEdit" />
33+
<openNewTab stepKey="openNewTab"/>
34+
<!--Open created cms page-->
35+
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="openEditPage">
36+
<argument name="page_id" value="1"/>
37+
</actionGroup>
38+
<waitForPageLoad stepKey="waitForCMSPage"/>
39+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
40+
<waitForPageLoad stepKey="waitForCMSPageToLoad"/>
41+
<conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="expandContentTabIfCollapsed"/>
42+
<actionGroup ref="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup" stepKey="verifyWYSIWYGEditorAndButtonsPresentInCurrentTab"/>
43+
<switchToNextTab stepKey="switchToNextTab"/>
44+
<conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="againExpandContentTabIfCollapsed"/>
45+
<actionGroup ref="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup" stepKey="verifyWYSIWYGEditorAndButtonsPresentInAnotherTab"/>
46+
</test>
47+
</tests>

‎app/code/Magento/Dhl/Test/Mftf/Test/AdminReorderPlacedUsingDHLAPShippingMethodTest.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminReorderPlacedUsingDHLAPShippingMethodTest" extends="StorefrontRegisteredCustomerUsesDHLAPOnlineShippingCarrierOnCheckoutTest">
12+
<annotations>
13+
<stories value="Admin Reorder with DHL Shipping method"/>
14+
<title value="Reorder placed order using DHL in admin panel"/>
15+
<description value="Reorder in admin panel order placed using DHL (AP) as a shipping method"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4802"/>
18+
<group value="pr_exclude"/>
19+
<group value="3rd_party_integration"/>
20+
</annotations>
21+
<remove keyForRemoval="selectExpressWorldWide"/>
22+
<click selector="{{CheckoutCartSummarySection.shippingMethods('Express easy')}}" after="verifyMedicalExpressIsAvailable" stepKey="selectExpressEasy"/>
23+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
24+
<actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
25+
<!--select Check/Money order payment method-->
26+
<scrollTo selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" stepKey="scrollToDHLShippingMethod"/>
27+
<waitForText selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" userInput="Express easy" stepKey="verifyDHLShippingMethodIsSelected"/>
28+
<waitForText selector="{{AdminOrderFormPaymentSection.verifyCheckMoneyPayment}}" userInput="Check / Money order" stepKey="verifyCheckMoneyOrderIsSelected"/>
29+
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
30+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatusIsPending"/>
31+
<waitForText selector="{{AdminOrderFormPaymentSection.shippingMethodName('DHL - Express easy')}}" userInput="DHL - Express easy" stepKey="verifyShippingAndHandlingInformationInOrderPage"/>
32+
</test>
33+
</tests>

‎app/code/Magento/Directory/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@
3535
<element name="selectPaymentMethod" type="radio" selector="//div[@id='order-billing_method_form']//input[@title='Check / Money order']"/>
3636
<element name="checkMoneyOrderText" type="text" selector="//div[@id='order-billing_method_form']//dl//dt//label[contains(text(),'Check / Money order')]"/>
3737
<element name="upsOption" type="radio" selector="//label[contains(text(),'UPS Worldwide Expedited -')]//ancestor::label[@class='admin__field-label']"/>
38+
<element name="DHLShipping" type="text" selector="//dd[@class='admin__order-shipment-methods-options' and contains(text(),'{{paymentMethodName}}')]" parameterized="true"/>
39+
<element name="shippingMethodName" type="text" selector="//*[contains(text(), '{{paymentMethodName}}')]" parameterized="true"/>
40+
<element name="verifyCheckMoneyPayment" type="text" selector="//label[@for='p_method_checkmo']"/>
3841
</section>
3942
</sections>

‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithConditionsAndDiscountActionGroup.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateCartPriceRuleWithConditionsAndDiscountActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
12+
<annotations>
13+
<description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Removes 'fillDiscountAmount'. Adds the 2 provided Conditions (Name, Rule, Rule to Change and Category Name) to a Cart Price Rule.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="condition1" type="string" defaultValue="Products subselection"/>
17+
<argument name="condition2" type="string" defaultValue="Category"/>
18+
<argument name="ruleToChange1" type="string" defaultValue="is"/>
19+
<argument name="rule1" type="string" defaultValue="equals or greater than"/>
20+
<argument name="ruleToChange2" type="string" defaultValue="..."/>
21+
<argument name="rule2" type="string" defaultValue="2"/>
22+
<argument name="categoryName" type="string" defaultValue="_defaultCategory.name"/>
23+
</arguments>
24+
25+
<!--Go to Conditions section-->
26+
<click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="selectActionType"/>
27+
<click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="addFirstCondition" after="openConditionsSection"/>
28+
<selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1')}}" userInput="{{condition1}}" stepKey="selectRule" after="addFirstCondition"/>
29+
<waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="waitForFirstRuleElement" after="selectRule"/>
30+
<click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="clickToChangeRule" after="waitForFirstRuleElement"/>
31+
<selectOption selector="{{AdminCartPriceRulesFormSection.ruleParameterSelect('1--1')}}" userInput="{{rule1}}" stepKey="selectRule1" after="clickToChangeRule"/>
32+
<waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForSecondRuleElement" after="selectRule1"/>
33+
<click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="clickToChangeRule1" after="waitForSecondRuleElement"/>
34+
<fillField selector="{{AdminCartPriceRulesFormSection.ruleParameterInput('1--1')}}" userInput="{{rule2}}" stepKey="fillRule" after="clickToChangeRule1"/>
35+
<click selector="{{AdminCartPriceRulesFormSection.addCondition('1--1')}}" stepKey="addSecondCondition" after="fillRule"/>
36+
<selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1--1')}}" userInput="{{condition2}}" stepKey="selectSecondCondition" after="addSecondCondition"/>
37+
<waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForThirdRuleElement" after="selectSecondCondition"/>
38+
<click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="addThirdCondition" after="waitForThirdRuleElement"/>
39+
<waitForElementVisible selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="waitForForthRuleElement" after="addThirdCondition"/>
40+
<click selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="openChooser" after="waitForForthRuleElement"/>
41+
<waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="waitForCategoryVisible" after="openChooser"/>
42+
<checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="checkCategoryName" after="waitForCategoryVisible"/>
43+
</actionGroup>
44+
</actionGroups>

0 commit comments

Comments
 (0)