Skip to content

Commit 7b4ea1a

Browse files
author
Oleksandr Dubovyk
committed
Merge remote-tracking branch 'mainline/2.4-develop' into PR17november
2 parents 0216c7d + e0561ce commit 7b4ea1a

File tree

75 files changed

+1202
-349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1202
-349
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
8+
<!--TODO: This datasets should be moved to CMS module-->
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="EnableWYSIWYG">

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
1515
<element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
1616
<element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
17+
<element name="inputFormKey" type="text" selector="input[name='form_key']"/>
1718
</section>
1819
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<before>
1212
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
1313
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
14-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
14+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
1515
</before>
1616
<annotations>
1717
<features value="Catalog"/>

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@
1010
<test name="AdminAddImageToWYSIWYGProductTest">
1111
<annotations>
1212
<features value="Catalog"/>
13-
<stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
14-
<group value="Catalog"/>
13+
<stories value="Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
1514
<title value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
1615
<description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
1716
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-84375"/>
17+
<testCaseId value="MC-25763"/>
18+
<group value="catalog"/>
1919
</annotations>
20+
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2223
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2425
</before>
26+
2527
<after>
2628
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
2729
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -32,8 +34,9 @@
3234
<actionGroup ref="FillMainProductFormActionGroup" stepKey="fillBasicProductInfo" />
3335

3436
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
35-
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDescription" />
37+
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDescription"/>
3638
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
39+
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDescriptionAgain"/>
3740
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon1" />
3841
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse1" />
3942
<waitForLoadingMaskToDisappear stepKey="waitForBrowseModal" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
23+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2424
<createData stepKey="myProductAttributeCreation" entity="productAttributeWysiwyg"/>
2525
<createData stepKey="myProductAttributeSetAssign" entity="AddToDefaultSet">
2626
<requiredEntity createDataKey="myProductAttributeCreation"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="EndToEndB2CLoggedInUserTest">
1212
<before>
13+
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" after="loginAsAdmin" stepKey="deleteAllProducts"/>
14+
1315
<createData entity="ApiCategory" stepKey="createCategory"/>
1416

1517
<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4"/>
23+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4"/>
2424
</before>
2525
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
2626
<waitForPageLoad stepKey="wait"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4"/>
23+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4"/>
2424
</before>
2525
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
2626
<waitForPageLoad stepKey="wait"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2525
</before>
2626
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToNewCatalog"/>
2727
<waitForLoadingMaskToDisappear stepKey="wait2" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
23+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2424
</before>
2525
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
2626
<waitForPageLoad stepKey="wait1"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest">
10+
<test name="StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest" deprecated="Use StoreFrontFreeShippingRecalculationAfterCouponCodeAppliedTest instead">
1111
<annotations>
12-
<title value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
12+
<title value="DEPRECATED. Checkout Free Shipping Recalculation after Coupon Code Added"/>
1313
<stories value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
1414
<description value="User should be able to do checkout free shipping recalculation after adding coupon code"/>
1515
<features value="Checkout"/>
1616
<severity value="BLOCKER"/>
1717
<testCaseId value="MAGETWO-96537"/>
1818
<useCaseId value="MAGETWO-96431"/>
1919
<group value="Checkout"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use StoreFrontFreeShippingRecalculationAfterCouponCodeAppliedTest instead</issueId>
22+
</skip>
2023
</annotations>
2124

2225
<before>
@@ -87,9 +90,8 @@
8790
<waitForPageLoad stepKey="waitForPageLoad"/>
8891
<see userInput="Your coupon was successfully applied." stepKey="seeSuccessMessage"/>
8992
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
90-
<!-- Cannot use waitForPageLoad as the below error message will disappear after a few seconds & waitForPageLoad will cause this test to be flaky -->
91-
<comment userInput="BIC workaround" stepKey="waitForError"/>
92-
<waitForText stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
93+
<waitForPageLoad stepKey="waitForError"/>
94+
<seeElementInDOM selector="{{CheckoutHeaderSection.errorMessageContainsText('The shipping method is missing. Select the shipping method and try again.')}}" stepKey="seeShippingMethodError"/>
9395
<amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
9496
<waitForPageLoad stepKey="waitForShippingPageLoad"/>
9597
<click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAppliedTest.xml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StoreFrontFreeShippingRecalculationAfterCouponCodeAppliedTest">
11+
<annotations>
12+
<features value="Checkout"/>
13+
<stories value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
14+
<title value="Checkout Free Shipping Recalculation after Coupon Code Added"/>
15+
<description value="User should be able to do checkout free shipping recalculation after adding coupon code"/>
16+
<severity value="BLOCKER"/>
17+
<testCaseId value="MC-28548"/>
18+
<useCaseId value="MAGETWO-96431"/>
19+
<group value="Checkout"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="Simple_US_Customer" stepKey="createCustomer">
24+
<field key="group_id">1</field>
25+
</createData>
26+
<createData entity="_defaultCategory" stepKey="defaultCategory"/>
27+
<createData entity="_defaultProduct" stepKey="simpleProduct">
28+
<field key="price">90</field>
29+
<requiredEntity createDataKey="defaultCategory"/>
30+
</createData>
31+
<!--It is default for FlatRate-->
32+
<createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
33+
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
34+
<createData entity="MinimumOrderAmount90" stepKey="minimumOrderAmount90"/>
35+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
36+
<argument name="tags" value=""/>
37+
</actionGroup>
38+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
39+
<actionGroup ref="AdminCartPriceRuleDeleteAllActionGroup" stepKey="deleteAllCartPriceRules"/>
40+
<actionGroup ref="AdminCreateCartPriceRuleWithCouponCodeActionGroup" stepKey="createCartPriceRule">
41+
<argument name="ruleName" value="CatPriceRule"/>
42+
<argument name="couponCode" value="CatPriceRule.coupon_code"/>
43+
</actionGroup>
44+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStoreFront">
45+
<argument name="Customer" value="$createCustomer$"/>
46+
</actionGroup>
47+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
48+
<argument name="productUrl" value="$simpleProduct.custom_attributes[url_key]$"/>
49+
</actionGroup>
50+
</before>
51+
52+
<after>
53+
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
54+
<deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
55+
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
56+
<createData entity="DefaultMinimumOrderAmount" stepKey="defaultMinimumOrderAmount"/>
57+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
58+
59+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
60+
<argument name="tags" value=""/>
61+
</actionGroup>
62+
<actionGroup ref="AdminCartPriceRuleDeleteAllActionGroup" stepKey="deleteAllCartPriceRules"/>
63+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
64+
</after>
65+
66+
<actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartRule">
67+
<argument name="product" value="$simpleProduct$"/>
68+
<argument name="couponCode" value="{{CatPriceRule.coupon_code}}"/>
69+
</actionGroup>
70+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
71+
<waitForPageLoad stepKey="waitForpageLoad1"/>
72+
<dontSee selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}" stepKey="dontSeeFreeShipping"/>
73+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
74+
<conditionalClick selector="{{DiscountSection.DiscountTab}}" dependentSelector="{{DiscountSection.CouponInput}}" visible="false" stepKey="openDiscountTabIfClosed"/>
75+
<waitForPageLoad stepKey="waitForCouponTabOpen1"/>
76+
<click selector="{{DiscountSection.CancelCoupon}}" stepKey="cancelCoupon"/>
77+
<waitForPageLoad stepKey="waitForCancel"/>
78+
<see userInput='You canceled the coupon code.' stepKey="seeCancellationMessage"/>
79+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
80+
<waitForPageLoad stepKey="waitForShippingMethods"/>
81+
<click selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}" stepKey="chooseFreeShipping"/>
82+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextAfterFreeShippingMethodSelection"/>
83+
<waitForPageLoad stepKey="waitForReviewAndPayments"/>
84+
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCouponCode">
85+
<argument name="discountCode" value="{{CatPriceRule.coupon_code}}"/>
86+
</actionGroup>
87+
<!-- Assert order cannot be placed and error message will shown. -->
88+
<actionGroup ref="AssertStorefrontOrderIsNotPlacedActionGroup" stepKey="seeShippingMethodError">
89+
<argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
90+
</actionGroup>
91+
<amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
92+
<waitForPageLoad stepKey="waitForShippingPageLoad"/>
93+
94+
<click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>
95+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
96+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextAfterFlatRateShippingMethodSelection"/>
97+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
98+
<!-- Place Order -->
99+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
100+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
101+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
102+
</actionGroup>
103+
</test>
104+
</tests>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutForShowShippingMethodNoApplicableTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNextButton"/>
5959
<!-- Assert order cannot be placed and error message will shown. -->
6060
<waitForPageLoad stepKey="waitForError"/>
61-
<see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
61+
<seeElementInDOM selector="{{CheckoutHeaderSection.errorMessageContainsText('The shipping method is missing. Select the shipping method and try again')}}" stepKey="seeShippingMethodError"/>
6262
</test>
6363
</tests>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliEnableTinyMCE4ActionGroup">
12+
<annotations>
13+
<description>Enable Tiny MCE 4 by CLI command config:set</description>
14+
</annotations>
15+
16+
<magentoCLI command="config:set {{EnableTinyMCE4.path}} {{EnableTinyMCE4.value}}" stepKey="enableTinyMCE4"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2626
</before>
2727
<actionGroup ref="AssignBlockToCMSPage" stepKey="assignBlockToCMSPage">
2828
<argument name="Block" value="$$createPreReqBlock$$"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2525
</before>
2626
<after>
2727
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -33,7 +33,7 @@
3333
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
3434
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
</after>
36-
36+
3737
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3838
<argument name="CMSPage" value="$$createCMSPage$$"/>
3939
</actionGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2626
</before>
2727
<!--Create Custom Variable-->
2828
<actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<before>
2020
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2121
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
22-
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
22+
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
2323
</before>
2424
<!--Create Custom Variable-->
2525
<actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />

0 commit comments

Comments
 (0)