-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1733 from magento-gl/2.4-develop
Merge 2.4-develop into AC-9712
- Loading branch information
Showing
36 changed files
with
1,284 additions
and
12 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddTextSwatchForAdminActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminAddTextSwatchForAdminActionGroup"> | ||
| <annotations> | ||
| <description>Admin add texual swatch for admin.</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="position" type="string"/> | ||
| <argument name="swatchName" type="string"/> | ||
| <argument name="swatchDescription" type="string"/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{AttributeManageSwatchSection.textSwatchAdminSwatchValue(position)}}" stepKey="waitForSwatchTextBoxForAdminToVisible"/> | ||
| <fillField selector="{{AttributeManageSwatchSection.textSwatchAdminSwatchValue(position)}}" userInput="{{swatchName}}" stepKey="fillSwatchForAdmin"/> | ||
| <waitForElementVisible selector="{{AttributeManageSwatchSection.textSwatchAdminDescriptionValue(position)}}" stepKey="waitForDescriptionTextBoxForAdminToVisible"/> | ||
| <fillField selector="{{AttributeManageSwatchSection.textSwatchAdminDescriptionValue(position)}}" userInput="{{swatchDescription}}" stepKey="fillDescriptionForAdmin"/> | ||
| </actionGroup> | ||
| </actionGroups> |
25 changes: 25 additions & 0 deletions
25
app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddTextSwatchForStoreViewActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminAddTextSwatchForStoreViewActionGroup"> | ||
| <annotations> | ||
| <description>Admin add texual swatch for storeview.</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="position" type="string"/> | ||
| <argument name="swatchName" type="string"/> | ||
| <argument name="swatchDescription" type="string"/> | ||
| </arguments> | ||
| <waitForElementVisible selector="{{AttributeManageSwatchSection.textSwatchDefaultStoreSwatchValue(position)}}" stepKey="waitForSwatchTextBoxForAdminToVisible"/> | ||
| <fillField selector="{{AttributeManageSwatchSection.textSwatchDefaultStoreSwatchValue(position)}}" userInput="{{swatchName}}" stepKey="fillSwatchForStoreView"/> | ||
| <waitForElementVisible selector="{{AttributeManageSwatchSection.textSwatchDefaultStoreDescriptionValue(position)}}" stepKey="waitForDescriptionTextBoxForAdminToVisible"/> | ||
| <fillField selector="{{AttributeManageSwatchSection.textSwatchDefaultStoreDescriptionValue(position)}}" userInput="{{swatchDescription}}" stepKey="fillDescriptionForStoreView"/> | ||
| </actionGroup> | ||
| </actionGroups> |
28 changes: 28 additions & 0 deletions
28
app/code/Magento/Catalog/Test/Mftf/ActionGroup/FilterProductGridByProductNameActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="FilterProductGridByProductNameActionGroup"> | ||
| <annotations> | ||
| <description>Filters the Admin Products grid by the provided Product (Name).</description> | ||
| </annotations> | ||
| <arguments> | ||
| <argument name="productName" type="string"/> | ||
| </arguments> | ||
| <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/> | ||
| <waitForElementClickable selector="{{AdminProductGridFilterSection.filters}}" stepKey="openForFilterField"/> | ||
| <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/> | ||
| <waitForElementVisible selector="{{AdminProductGridFilterSection.nameFilter}}" stepKey="waitForFilterFieldToBecomeActive"/> | ||
| <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{productName}}" stepKey="fillProductName"/> | ||
| <waitForElementClickable selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="waitToClickApplyFilter"/> | ||
| <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/> | ||
| <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/> | ||
| </actionGroup> | ||
| </actionGroups> | ||
|
|
16 changes: 16 additions & 0 deletions
16
...st/Mftf/ActionGroup/StorefrontAssertAddToCartButtonNotPresentOnProductPageActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="StorefrontAssertAddToCartButtonNotPresentOnProductPageActionGroup"> | ||
| <annotations> | ||
| <description>Validate "Add to Cart" button is NOT present on product page.</description> | ||
| </annotations> | ||
| <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCartButtonNotPresent"/> | ||
| </actionGroup> | ||
| </actionGroups> |
16 changes: 16 additions & 0 deletions
16
.../Test/Mftf/ActionGroup/StorefrontAssertProductPriceNotPresentOnProductPageActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| --> | ||
|
|
||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="StorefrontAssertProductPriceNotPresentOnProductPageActionGroup"> | ||
| <annotations> | ||
| <description>Validate that the provided Product Price is NOT present on product page.</description> | ||
| </annotations> | ||
| <waitForElementNotVisible selector="{{StorefrontProductInfoMainSection.price}}" stepKey="verifyProductPriceNotVisible"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...reements/Test/Mftf/ActionGroup/AdminDisableTermsAndConditionsConfigurationActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminDisableTermsAndConditionsConfigurationActionGroup"> | ||
| <annotations> | ||
| <description>Disable Terms and Conditions On Configuration page.</description> | ||
| </annotations> | ||
| <magentoCLI command="config:set {{disableTermsAndConditions.path}} {{disableTermsAndConditions.value}}" stepKey="DisableTermsAndConditions"/> | ||
| </actionGroup> | ||
| </actionGroups> |
16 changes: 16 additions & 0 deletions
16
...greements/Test/Mftf/ActionGroup/AdminEnableTermsAndConditionsConfigurationActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminEnableTermsAndConditionsConfigurationActionGroup"> | ||
| <annotations> | ||
| <description>Enable Terms and Conditions On Configuration page.</description> | ||
| </annotations> | ||
| <magentoCLI command="config:set {{enableTermsAndConditions.path}} {{enableTermsAndConditions.value}}" stepKey="EnableTermsAndConditions"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...f/Test/StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressCheckoutReviewPageTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressCheckoutReviewPageTest"> | ||
| <annotations> | ||
| <features value="CheckoutAgreements"/> | ||
| <stories value="Checkout agreements and Paypal express checkout"/> | ||
| <title value="Assert Several Terms And Conditions On PayPal Express Checkout Review Page"/> | ||
| <description value="Several Terms and Conditions with different types are shown on PayPal express checkout review page"/> | ||
| <severity value="MAJOR"/> | ||
| <testCaseId value="AC-4430"/> | ||
| <group value="paypalExpress"/> | ||
| <group value="3rd_party_integration" /> | ||
| <group value="pr_exclude" /> | ||
| </annotations> | ||
| <before> | ||
| <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/> | ||
| <createData entity="SimpleProduct" stepKey="createSimpleProduct"/> | ||
| <actionGroup ref="AdminEnableTermsAndConditionsConfigurationActionGroup" stepKey="EnableTermsAndConditions"/> | ||
| <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/> | ||
| </before> | ||
| <after> | ||
| <!--Delete created data--> | ||
| <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/> | ||
| <actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/> | ||
| <actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/> | ||
| <actionGroup ref="AdminDisableTermsAndConditionsConfigurationActionGroup" stepKey="disableTermsAndConditions"/> | ||
| <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/> | ||
| </after> | ||
| <!-- create manual term --> | ||
| <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTermForManualTerm"/> | ||
| <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="createManualTerm"> | ||
| <argument name="term" value="newHtmlTerm"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveManualTerm"/> | ||
| <!-- create automatic term --> | ||
| <actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTermForAutomaticTerm"/> | ||
| <actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="createAutomaticTerm"> | ||
| <argument name="term" value="newHtmlAutomaticallyTerm"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveAutomaticTerm"/> | ||
| <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex"> | ||
| <argument name="indices" value=""/> | ||
| </actionGroup> | ||
| <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache"> | ||
| <argument name="tags" value="config full_page"/> | ||
| </actionGroup> | ||
| <!-- Login as customer --> | ||
| <actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin"> | ||
| <argument name="Customer" value="$$createCustomer$$"/> | ||
| </actionGroup> | ||
| <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart"> | ||
| <argument name="product" value="$createSimpleProduct$"/> | ||
| </actionGroup> | ||
| <!--Navigate to checkout--> | ||
| <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/> | ||
| <!-- Click next button to open payment section --> | ||
| <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/> | ||
| <!-- Click on PayPal payment radio button --> | ||
| <waitForElementClickable selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="waitForPayPalRadioButton"/> | ||
| <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="selectPaypalPayment"/> | ||
| <!-- Verify both manual and automatic are present --> | ||
| <waitForText selector="{{StorefrontCheckoutAgreementsSection.manualCheckoutAgreementLink('agreement_paypal_express')}}" userInput="{{newHtmlTerm.checkboxText}}" stepKey="seeManualTermTextInCheckoutIsPresent"/> | ||
| <waitForText selector="{{StorefrontCheckoutAgreementsSection.automaticCheckoutAgreementLink('agreement_paypal_express')}}" userInput="{{newHtmlAutomaticallyTerm.checkboxText}}" stepKey="seeAutomaticTermTextInCheckoutIsPresent"/> | ||
| <!-- open manual terms and conditions and verify content messages--> | ||
| <waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.manualCheckoutAgreementLink('agreement_paypal_express')}}" stepKey="waitForManualTermTextInCheckoutIsClickable"/> | ||
| <click selector="{{StorefrontCheckoutAgreementsSection.manualCheckoutAgreementLink('agreement_paypal_express')}}" stepKey="clickManualTermTextInCheckout"/> | ||
| <waitForElement selector="{{StorefrontCheckoutAgreementsSection.contentArea(newHtmlTerm.content)}}" stepKey="verifyManualTermContentTextMessage"/> | ||
| <waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="waitForCloseToBeClickable"/> | ||
| <click selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="ClickOnClose"/> | ||
| <!-- open automatic terms and conditions and verify content messages--> | ||
| <waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.automaticCheckoutAgreementLink('agreement_paypal_express')}}" stepKey="waitForAutomaticTermTextInCheckoutIsClickable"/> | ||
| <click selector="{{StorefrontCheckoutAgreementsSection.automaticCheckoutAgreementLink('agreement_paypal_express')}}" stepKey="clickAutomaticTermTextInCheckoutIsClickable"/> | ||
| <waitForElement selector="{{StorefrontCheckoutAgreementsSection.contentArea(newHtmlAutomaticallyTerm.content)}}" stepKey="verifyAutomaticTermContentTextMessage"/> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.