Skip to content

Commit

Permalink
Merge pull request magento#4305 from magento-pangolin/MQE-1367
Browse files Browse the repository at this point in the history
[pangolins] MQE-1367: XSD schema validation error fixes
  • Loading branch information
okolesnyk authored Jun 5, 2019
2 parents 514e3d0 + 2755371 commit 553946c
Show file tree
Hide file tree
Showing 27 changed files with 49 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@

<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
<click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
<click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled"/>
<waitForPageLoad stepKey="waitForStatusToBeChanged"/>
<see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
<waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<actionGroup name="AddProductCustomOptionField">
<arguments>
<argument name="option" defaultValue="ProductOptionField"/>
<argiment name="optionIndex" type="string"/>
<argument name="optionIndex" type="string"/>
</arguments>
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
<click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
Expand Down Expand Up @@ -90,7 +90,7 @@
<actionGroup name="checkCustomizableOptionImport">
<arguments>
<argument name="option" defaultValue="ProductOptionField"/>
<argiment name="optionIndex" type="string"/>
<argument name="optionIndex" type="string"/>
</arguments>
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
<grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.WysiwygArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading4" timeout="45"/>
<waitForLoadingMaskToDisappear stepKey="waitForLoading4"/>
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload1" timeout="30"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload1"/>
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
<seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
Expand All @@ -60,7 +60,7 @@
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload2" timeout="45"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload2"/>
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" stepKey="waitForImageDescriptionButton1" />
Expand All @@ -72,12 +72,12 @@
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading13" timeout="30"/>
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading14" timeout="40"/>
<waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
<dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload3" timeout="45"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload3"/>
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
<waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
Expand All @@ -86,7 +86,7 @@
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete2" />
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn4" />
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload4" timeout="45"/>
<waitForLoadingMaskToDisappear stepKey="waitForFileUpload4"/>
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
<waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
<argument name="paymentMethod" type="string"/>
</arguments>
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="waitForLoading3" stepKey="waitForPaymentSectionLoaded"/>
<conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" parametrized="true" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
<conditionalClick selector="{{CheckoutPaymentSection.paymentMethodByName(paymentMethod)}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="enterFirstName" stepKey="clickCheckMoneyOrderPayment"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<doubleClick selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginBtn"/>
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
<waitForPageLoad stepKey="waitToBeLoggedIn"/>
<waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="waitForEmailInvisible" time ="60"/>
<waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForEmailInvisible" time ="60"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<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"/>
<element name="RemoveItem" type="button"
selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
<element name="removeProductByName" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
<element name="removeProductByName" type="text" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
<element name="productName" type="text" selector="//tbody[@class='cart item']//strong[@class='product-item-name']"/>
<element name="nthItemOption" type="block" selector=".item:nth-of-type({{numElement}}) .item-options" parameterized="true"/>
<element name="nthEditButton" type="block" selector=".item:nth-of-type({{numElement}}) .action-edit" parameterized="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<stories value="OnePageCheckout within Offline Payment Methods"/>
<title value="OnePageCheckout as customer using new address test"/>
<description value="Checkout as customer using new address"/>
<severity value="CRITICAl"/>
<severity value="CRITICAL"/>
<testCaseId value="MC-14740"/>
<group value="checkout"/>
<group value="mtf_migrated"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<stories value="OnePageCheckout within Offline Payment Methods"/>
<title value="OnePageCheckout as customer using non default address test"/>
<description value="Checkout as customer using non default address"/>
<severity value="CRITICAl"/>
<severity value="CRITICAL"/>
<testCaseId value="MC-14739"/>
<group value="checkout"/>
<group value="mtf_migrated"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<stories value="OnePageCheckout within Offline Payment Methods"/>
<title value="OnePageCheckout using sign in link test"/>
<description value="Checkout using 'Sign In' link"/>
<severity value="CRITICAl"/>
<severity value="CRITICAL"/>
<testCaseId value="MC-14738"/>
<group value="checkout"/>
<group value="mtf_migrated"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<stories value="OnePageCheckout within Offline Payment Methods"/>
<title value="OnePageCheckout with all product types test"/>
<description value="Checkout with all product types"/>
<severity value="CRITICAl"/>
<severity value="CRITICAL"/>
<testCaseId value="MC-14742"/>
<group value="checkout"/>
<group value="mtf_migrated"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}" />
<waitForPageLoad stepKey="waitBillingForm"/>
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
<dontSee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>

<!-- Fill UK Address and verify that payment available and checkout successful -->
<uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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

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

<actionGroup name="SelectCountriesWithRequiredRegion">
<arguments>
<argument name="countries" type="countryArray"/>
<argument name="countries" type="entity"/>
</arguments>
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
<conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
<element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
<element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
<element name="storefrontPropertiesTab" selector="#front_fieldset-wrapper"/>
<element name="storefrontPropertiesTitle" selector="//span[text()='Storefront Properties']"/>
<element name="storefrontPropertiesTab" type="button" selector="#front_fieldset-wrapper"/>
<element name="storefrontPropertiesTitle" type="text" selector="//span[text()='Storefront Properties']"/>
<element name="container" type="text" selector="#create_new_attribute"/>
<element name="saveAttribute" type="button" selector="#save"/>
<element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@
<click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
<waitForPageLoad stepKey="waitForPageLoad4"/>
<see userInput="$$createConfigProduct.name$$" stepKey="assertProductPresent"/>
<See userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
<see userInput="$$createConfigChildProduct1.price$$" stepKey="assertProductPricePresent"/>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
<waitForPageLoad stepKey="waitForCustomersGrid"/>
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
<executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="countriesAmount2"/>
<assertEquals expected='($countriesAmount)' expectedType="integer" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
<assertEquals expected="($countriesAmount)" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in United Kingdom"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country United Kingdom"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-16679"/>
<group value="paypal"/>
</annotations>
Expand Down Expand Up @@ -79,7 +79,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in Japan"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-13146"/>
<group value="paypal"/>
</annotations>
Expand Down Expand Up @@ -119,7 +119,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in France"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-16675"/>
<group value="paypal"/>
</annotations>
Expand Down Expand Up @@ -159,7 +159,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in Hong Kong"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Hong Kong"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-16676"/>
<group value="paypal"/>
</annotations>
Expand Down Expand Up @@ -199,7 +199,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in Italy"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-16677"/>
<group value="paypal"/>
</annotations>
Expand Down Expand Up @@ -239,7 +239,7 @@
<stories value="Payment methods"/>
<title value="Conflict resolution for PayPal in Spain"/>
<description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
<severity value="Major"/>
<severity value="MAJOR"/>
<testCaseId value="MC-16678"/>
<group value="paypal"/>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<executeJS function="jQuery('.zoid-component-frame.zoid-visible').attr('id', 'myIframe')" stepKey="clickOrderLink"/>
<!--switch to iframe of PayPal group button-->
<comment userInput="switch to iframe of PayPal group button" stepKey="commentSwitchToIframe"/>
<switchToIframe userInput="myIframe" stepKey="clickPrintOrderLink"/>
<switchToIFrame userInput="myIframe" stepKey="clickPrintOrderLink"/>
<waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
<seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.size(PayPalSize.medium)}}" stepKey="seeButtonInMediumSize"/>
<seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.shape(PayPalShape.pill)}}" stepKey="seeButtonInPillShape"/>
Expand Down
Loading

0 comments on commit 553946c

Please sign in to comment.