Skip to content

Commit 033cc31

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-epam/EPAM-PR-55
2 parents 54d871c + 553946c commit 033cc31

27 files changed

+49
-62
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256

257257
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
258258
<click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
259-
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
259+
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled"/>
260260
<waitForPageLoad stepKey="waitForStatusToBeChanged"/>
261261
<see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
262262
<waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<actionGroup name="AddProductCustomOptionField">
5656
<arguments>
5757
<argument name="option" defaultValue="ProductOptionField"/>
58-
<argiment name="optionIndex" type="string"/>
58+
<argument name="optionIndex" type="string"/>
5959
</arguments>
6060
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
6161
<click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
@@ -90,7 +90,7 @@
9090
<actionGroup name="checkCustomizableOptionImport">
9191
<arguments>
9292
<argument name="option" defaultValue="ProductOptionField"/>
93-
<argiment name="optionIndex" type="string"/>
93+
<argument name="optionIndex" type="string"/>
9494
</arguments>
9595
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
9696
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.WysiwygArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
4848
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
4949
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
50-
<waitForLoadingMaskToDisappear stepKey="waitForLoading4" timeout="45"/>
50+
<waitForLoadingMaskToDisappear stepKey="waitForLoading4"/>
5151
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
52-
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload1" timeout="30"/>
52+
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload1"/>
5353
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
5454
<seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
5555
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
@@ -60,7 +60,7 @@
6060
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
6161
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
6262
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
63-
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload2" timeout="45"/>
63+
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload2"/>
6464
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
6565
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
6666
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" stepKey="waitForImageDescriptionButton1" />
@@ -72,12 +72,12 @@
7272
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
7373
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
7474
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
75-
<waitForLoadingMaskToDisappear stepKey="waitForLoading13" timeout="30"/>
75+
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
7676
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
77-
<waitForLoadingMaskToDisappear stepKey="waitForLoading14" timeout="40"/>
77+
<waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
7878
<dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
7979
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
80-
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload3" timeout="45"/>
80+
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload3"/>
8181
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
8282
<waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
8383
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
@@ -86,7 +86,7 @@
8686
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete2" />
8787
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn4" />
8888
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
89-
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload4" timeout="45"/>
89+
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload4"/>
9090
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
9191
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
9292
<waitForLoadingMaskToDisappear stepKey="waitForLoading11" />

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@
7070
<argument name="paymentMethod" type="string"/>
7171
</arguments>
7272
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="waitForLoading3" stepKey="waitForPaymentSectionLoaded"/>
73-
<conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" parametrized="true" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
73+
<conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
7474
</actionGroup>
7575
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
<doubleClick selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginBtn"/>
2323
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
2424
<waitForPageLoad stepKey="waitToBeLoggedIn"/>
25-
<waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="waitForEmailInvisible" time ="60"/>
25+
<waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForEmailInvisible" time ="60"/>
2626
</actionGroup>
2727
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<element name="ProductPriceByOption" type="text" selector="//*[contains(@class, 'item-options')]/dd[normalize-space(.)='{{var1}}']/ancestor::tr//td[contains(@class, 'price')]//span[@class='price']" parameterized="true"/>
3131
<element name="RemoveItem" type="button"
3232
selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
33-
<element name="removeProductByName" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
33+
<element name="removeProductByName" type="text" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
3434
<element name="productName" type="text" selector="//tbody[@class='cart item']//strong[@class='product-item-name']"/>
3535
<element name="nthItemOption" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
3636
<element name="nthEditButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="OnePageCheckout within Offline Payment Methods"/>
1515
<title value="OnePageCheckout as customer using new address test"/>
1616
<description value="Checkout as customer using new address"/>
17-
<severity value="CRITICAl"/>
17+
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14740"/>
1919
<group value="checkout"/>
2020
<group value="mtf_migrated"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="OnePageCheckout within Offline Payment Methods"/>
1515
<title value="OnePageCheckout as customer using non default address test"/>
1616
<description value="Checkout as customer using non default address"/>
17-
<severity value="CRITICAl"/>
17+
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14739"/>
1919
<group value="checkout"/>
2020
<group value="mtf_migrated"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="OnePageCheckout within Offline Payment Methods"/>
1515
<title value="OnePageCheckout using sign in link test"/>
1616
<description value="Checkout using 'Sign In' link"/>
17-
<severity value="CRITICAl"/>
17+
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14738"/>
1919
<group value="checkout"/>
2020
<group value="mtf_migrated"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="OnePageCheckout within Offline Payment Methods"/>
1515
<title value="OnePageCheckout with all product types test"/>
1616
<description value="Checkout with all product types"/>
17-
<severity value="CRITICAl"/>
17+
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14742"/>
1919
<group value="checkout"/>
2020
<group value="mtf_migrated"/>

0 commit comments

Comments
 (0)