Skip to content

Commit 92682b3

Browse files
soumyausoumyau
committed
MQE-1367: XSD Schema validation must be triggered before merging to mainline
Fixed XSD schema validation errors for CE, EE, B2B for 2.3-develop
1 parent f106d73 commit 92682b3

21 files changed

+44
-44
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/CheckoutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<argument name="paymentMethod" type="string"/>
111111
</arguments>
112112
<remove keyForRemoval="checkMessage"/>
113-
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" parametrized="true" stepKey="paymentMethodDoesNotAvailable"/>
113+
<dontSee selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" stepKey="paymentMethodDoesNotAvailable"/>
114114
</actionGroup>
115115
<!-- Logged in user checkout filling shipping section -->
116116
<actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">

‎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/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
<click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}" />
253253
<waitForPageLoad stepKey="waitBillingForm"/>
254254
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
255-
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
255+
<dontSee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
256256

257257
<!-- Fill UK Address and verify that payment available and checkout successful -->
258258
<uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<actionGroup name="SelectTopDestinationsCountry">
2424
<arguments>
25-
<argument name="countries" type="countryArray"/>
25+
<argument name="countries" type="entity"/>
2626
</arguments>
2727
<selectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="selectTopDestinationsCountry"/>
2828
<click selector="#save" stepKey="saveConfig"/>
@@ -31,7 +31,7 @@
3131

3232
<actionGroup name="UnSelectTopDestinationsCountry">
3333
<arguments>
34-
<argument name="countries" type="countryArray"/>
34+
<argument name="countries" type="entity"/>
3535
</arguments>
3636
<unselectOption selector="{{CountryOptionsSection.topDestinations}}" parameterArray="[{{countries.country}}]" stepKey="unSelectTopDestinationsCountry"/>
3737
<click selector="#save" stepKey="saveConfig"/>
@@ -40,7 +40,7 @@
4040

4141
<actionGroup name="SelectCountriesWithRequiredRegion">
4242
<arguments>
43-
<argument name="countries" type="countryArray"/>
43+
<argument name="countries" type="entity"/>
4444
</arguments>
4545
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
4646
<conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab" />

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
1717
<element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
1818
<element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
19-
<element name="storefrontPropertiesTab" selector="#front_fieldset-wrapper"/>
20-
<element name="storefrontPropertiesTitle" selector="//span[text()='Storefront Properties']"/>
19+
<element name="storefrontPropertiesTab" type="button" selector="#front_fieldset-wrapper"/>
20+
<element name="storefrontPropertiesTitle" type="text" selector="//span[text()='Storefront Properties']"/>
2121
<element name="container" type="text" selector="#create_new_attribute"/>
2222
<element name="saveAttribute" type="button" selector="#save"/>
2323
<element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,6 @@
207207
<click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
208208
<waitForPageLoad stepKey="waitForPageLoad4"/>
209209
<see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent"/>
210-
<See userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
210+
<see userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
211211
</test>
212212
</tests>

‎app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@
113113
<waitForPageLoad stepKey="waitForCustomersGrid"/>
114114
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
115115
<executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="countriesAmount2"/>
116-
<assertEquals expected='($countriesAmount)' expectedType="integer" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
116+
<assertEquals expected='($countriesAmount)' expectedType="int" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
117117
</test>
118118
</tests>

0 commit comments

Comments
 (0)