Skip to content

Commit 1169127

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-17199' into 2.2-develop-pr95
2 parents ecb94d8 + e700c0c commit 1169127

File tree

11 files changed

+36
-22
lines changed

11 files changed

+36
-22
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
@@ -92,7 +92,7 @@
9292

9393
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
9494
<click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
95-
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
95+
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled"/>
9696
<waitForPageLoad stepKey="waitForStatusToBeChanged"/>
9797
<see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
9898
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<element name="requiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
4343
<element name="customAttributeDropdownField" type="select" selector="select[name='product[{{attributeCode}}]']" parameterized="true"/>
4444
<element name="customAttributeInputField" type="select" selector="input[name='product[{{attributeCode}}]']" parameterized="true"/>
45+
<element name="customAttributeSelectOptions" type="select" selector="select[name='product[{{attributeCode}}]'] option" parameterized="true"/>
4546
</section>
4647
<section name="ProductInWebsitesSection">
4748
<element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>

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

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,27 @@
5353
<!--Go to Product edit page-->
5454
<amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
5555
<scrollToTopOfPage stepKey="scrollToShowAttribute"/>
56-
<!--Click on attribute dropdown-->
57-
<click selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown"/>
56+
57+
<!-- Grab attribute dropdown options -->
58+
<grabMultiple selector="{{AdminProductFormSection.customAttributeSelectOptions($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown" />
59+
5860
<!--Check attribute dropdown options-->
59-
<waitForElementVisible selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="waitDropdownAppears"/>
60-
<see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_1" stepKey="seeFirstAdminOption"/>
61-
<see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_2" stepKey="seeSecondAdminOption"/>
62-
<dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="dontSeeFirstStoreOption"/>
63-
<dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option2" stepKey="dontSeeSecondStoreOption"/>
61+
<assertContains stepKey="seeFirstAdminOption">
62+
<actualResult type="variable">clickOnAttributeDropdown</actualResult>
63+
<expectedResult type="string">admin_option_1</expectedResult>
64+
</assertContains>
65+
<assertContains stepKey="seeSecondAdminOption">
66+
<actualResult type="variable">clickOnAttributeDropdown</actualResult>
67+
<expectedResult type="string">admin_option_2</expectedResult>
68+
</assertContains>
69+
70+
<assertNotContains stepKey="dontSeeFirstStoreOption">
71+
<actualResult type="variable">clickOnAttributeDropdown</actualResult>
72+
<expectedResult type="string">option1</expectedResult>
73+
</assertNotContains>
74+
<assertNotContains stepKey="dontSeeSecondStoreOption">
75+
<actualResult type="variable">clickOnAttributeDropdown</actualResult>
76+
<expectedResult type="string">option2</expectedResult>
77+
</assertNotContains>
6478
</test>
6579
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<element name="addSaveButton" type="button" selector=".action.primary.action-save-address"/>
3535
<element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
3636
<element name="namePrefix" type="select" selector="select[name=prefix]"/>
37-
<element name="namePrefixOption" type="text" selector="select[name=prefix] option[value='{{optionValue}}']" parameterized="true"/>
38-
<element name="nameSuffix" type="selector" selector="[name='suffix']"/>
37+
<element name="namePrefixOption" type="select" selector="select[name=prefix] option[value='{{optionValue}}']" parameterized="true"/>
38+
<element name="nameSuffix" type="select" selector="[name='suffix']"/>
3939
<element name="nameSuffixOption" type="text" selector="select[name='suffix'] option[value='{{optionValue}}']" parameterized="true" timeout="30"/>
4040
</section>
4141
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<actionGroup ref="GuestCheckoutFillingShippingSectionWithoutPaymentsActionGroup" stepKey="guestCheckoutFillingShippingSection">
4949
<argument name="customerVar" value="Simple_US_Customer"/>
5050
<argument name="customerAddressVar" value="US_Address_TX"/>
51-
<argument name="shippingMethod" value="Flat Rate" type="string"/>
51+
<argument name="shippingMethod" value="Flat Rate"/>
5252
</actionGroup>
5353

5454
<waitForElementVisible selector="{{CheckoutPaymentSection.noPaymentMethods}}" stepKey="waitMessage"/>

‎app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
stepKey="seeLoggedInCustomerWelcomeMessage"/>
5555
<!--Logout and check default welcome message-->
5656
<actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
57-
<seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
57+
<seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl"/>
5858
<see userInput="Default welcome msg!"
5959
selector="{{StorefrontHeaderSection.welcomeMessage}}"
6060
stepKey="seeDefaultWelcomeMessage"/>
@@ -71,7 +71,7 @@
7171

7272
<!--Logout and check persistent customer welcome message-->
7373
<actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
74-
<seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
74+
<seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl1"/>
7575
<see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
7676
selector="{{StorefrontHeaderSection.welcomeMessage}}"
7777
stepKey="seePersistentWelcomeMessage"/>

‎app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<fillField selector="{{AdminProductNewVideoSection.videoUrlTextField}}" userInput="{{video.videoUrl}}" stepKey="fillFieldVideoUrl"/>
2525
<fillField selector="{{AdminProductNewVideoSection.videoTitleTextField}}" userInput="{{video.videoTitle}}" stepKey="fillFieldVideoTitle"/>
2626
<waitForPageLoad stepKey="waitForPageLoad"/>
27-
<waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" wait="30" stepKey="waitForSaveButtonVisible"/>
27+
<waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" time="30" stepKey="waitForSaveButtonVisible"/>
2828
<click selector="{{AdminProductNewVideoSection.saveButton}}" stepKey="saveVideo"/>
2929
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
3030
</actionGroup>

‎app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontProductInfoMainSection">
1212
<element name="productVideo" type="text" selector=".product-video[data-type='{{videoType}}']" parameterized="true"/>
13-
<element name="clickInVideo" type="video" selector=".fotorama__stage__shaft"/>
14-
<element name="videoPausedMode" type="video" selector="[class*='paused-mode']"/>
15-
<element name="videoPlayedMode" type="video" selector="[class*='playing-mode']"/>
16-
<element name="frameVideo" type="video" selector="widget2"/>
13+
<element name="clickInVideo" type="button" selector=".fotorama__stage__shaft"/>
14+
<element name="videoPausedMode" type="button" selector="[class*='paused-mode']"/>
15+
<element name="videoPlayedMode" type="button" selector="[class*='playing-mode']"/>
16+
<element name="frameVideo" type="button" selector="widget2"/>
1717
</section>
1818
</sections>

‎app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminOrderReportMainActionsSection">
12-
<element name="showReport" type="button" time="30" selector="#filter_form_submit"/>
13-
<element name="refreshStatistics" type="text" time="30" selector="//a[contains(text(), 'here')]"/>
12+
<element name="showReport" type="button" timeout="30" selector="#filter_form_submit"/>
13+
<element name="refreshStatistics" type="text" timeout="30" selector="//a[contains(text(), 'here')]"/>
1414
</section>
1515
</sections>

‎app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml

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

9191
<actionGroup name="StorefrontValidateQtyAfterEditProductInWishlist" extends="StorefrontCustomerEditProductInWishlist">
9292
<arguments>
93-
<argument name="maxQtyAllowed" type="string" default="10000"/>
93+
<argument name="maxQtyAllowed" type="string" defaultValue="10000"/>
9494
</arguments>
9595
<remove keyForRemoval="successMessage"/>
9696
<waitForAjaxLoad after="submitUpdateWishlist" stepKey="waitForAjaxLoad"/>

0 commit comments

Comments
 (0)