Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MFTF: Extract Action Groups to separate files - magento/module-currency-symbol #25829

Merged
merged 3 commits into from
Dec 20, 2019
Merged

MFTF: Extract Action Groups to separate files - magento/module-currency-symbol #25829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6c5a33
REFACTOR: Extract Action Groups to separate files (according to MFTF …
lbajsarowicz Nov 28, 2019
bd42599
Refactor: Remove redundant section to avoid confusion
lbajsarowicz Nov 30, 2019
c60bbaa
BACKWARD COMPATIBILITY: Deprecated ActionGroups to make change Backwa…
lbajsarowicz Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminCurrencyRatesActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,4 @@
<click selector="{{AdminCurrencyRatesSection.import}}" stepKey="clickImport"/>
<waitForElementVisible selector="{{AdminCurrencyRatesSection.oldRate}}" stepKey="waitForOldRateVisible"/>
</actionGroup>
<actionGroup name="AdminSaveCurrencyRatesActionGroup">
<click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
<waitForPageLoad stepKey="waitForSave"/>
<see selector="{{AdminMessagesSection.success}}" userInput="All valid rates have been saved." stepKey="seeSuccessMessage"/>
</actionGroup>
<actionGroup name="AdminSetCurrencyRatesActionGroup">
<arguments>
<argument name="firstCurrency" type="string" defaultValue="USD"/>
<argument name="secondCurrency" type="string" defaultValue="EUR"/>
<argument name="rate" type="string" defaultValue="0.5"/>
</arguments>
<fillField selector="{{AdminCurrencyRatesSection.currencyRate(firstCurrency, secondCurrency)}}" userInput="{{rate}}" stepKey="setCurrencyRate"/>
<click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
<waitForPageLoad stepKey="waitForSave"/>
<see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencyRatesMessageData.success}}" stepKey="seeSuccessMessage"/>
</actionGroup>
</actionGroups>
16 changes: 16 additions & 0 deletions app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSaveCurrencyRatesActionGroup.xml
View file
Open in desktop
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="AdminSaveCurrencyRatesActionGroup">
<click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
<waitForPageLoad stepKey="waitForSave"/>
<see selector="{{AdminMessagesSection.success}}" userInput="All valid rates have been saved." stepKey="seeSuccessMessage"/>
</actionGroup>
</actionGroups>
22 changes: 22 additions & 0 deletions app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetCurrencyRatesActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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="AdminSetCurrencyRatesActionGroup">
<arguments>
<argument name="firstCurrency" type="string" defaultValue="USD"/>
<argument name="secondCurrency" type="string" defaultValue="EUR"/>
<argument name="rate" type="string" defaultValue="0.5"/>
</arguments>
<fillField selector="{{AdminCurrencyRatesSection.currencyRate(firstCurrency, secondCurrency)}}" userInput="{{rate}}" stepKey="setCurrencyRate"/>
<click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
<waitForPageLoad stepKey="waitForSave"/>
<see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencyRatesMessageData.success}}" stepKey="seeSuccessMessage"/>
</actionGroup>
</actionGroups>
9 changes: 0 additions & 9 deletions ...up/StorefrontCurrencyRatesActionGroup.xml → ...p/StorefrontSwitchCurrencyActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,4 @@
<click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
<see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
</actionGroup>
<actionGroup name="StorefrontSwitchCurrency">
<arguments>
<argument name="currency" type="string" defaultValue="EUR"/>
</arguments>
<click selector="{{StorefrontSwitchCurrencyRatesSection.currencyTrigger}}" stepKey="openTrigger"/>
<waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="waitForCurrency"/>
<click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
<see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
</actionGroup>
</actionGroups>
27 changes: 27 additions & 0 deletions app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<!--
NOTICE: Action Groups in this file are DEPRECATED and SHOULD NOT BE USED anymore.
Please find the Comment with proper replacement for each of ActionGroups provided.
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">

<actionGroup name="StorefrontSwitchCurrency">
<arguments>
<argument name="currency" type="string" defaultValue="EUR"/>
</arguments>

<!-- NOTICE: This ActionGroup is DEPRECATED! Use `StorefrontSwitchCurrencyActionGroup` instead -->
<click selector="{{StorefrontSwitchCurrencyRatesSection.currencyTrigger}}" stepKey="openTrigger"/>
<waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="waitForCurrency"/>
<click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
<see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
</actionGroup>
</actionGroups>
1 change: 0 additions & 1 deletion app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="StorefrontSwitchCurrencyRatesSection">
<element name="currencyToggle" type="select" selector="#switcher-currency-trigger" timeout="30"/>
<element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
<element name="currency" type="button" selector="//div[@id='switcher-currency-trigger']/following-sibling::ul//a[contains(text(), '{{currency}}')]" parameterized="true" timeout="10"/>
<element name="selectedCurrency" type="text" selector="#switcher-currency-trigger span"/>
</section>
Expand Down
2 changes: 1 addition & 1 deletion ...rrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!--Open created product on Storefront and place for order-->
<amOnPage url="{{StorefrontProductPage.url($$createNewProduct.custom_attributes[url_key]$$)}}" stepKey="goToNewProductPage"/>
<waitForPageLoad stepKey="waitForNewProductPagePageLoad"/>
<actionGroup ref="StorefrontSwitchCurrency" stepKey="switchCurrency">
<actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchCurrency">
<argument name="currency" value="RUB"/>
</actionGroup>
<actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontNewProductPage">
Expand Down