Skip to content

Commit a10b586

Browse files
committed
Merge branch 'ACQE-6326_1' into ACQE-7157-functional-tests-mainline-deployment
2 parents 7f3456f + 20277db commit a10b586

8 files changed

+55
-15
lines changed

app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminImportCurrencyRatesActionGroup">
12+
<annotations>
13+
<description>Admin imports currency rate.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="rateService" type="string" defaultValue="Fixer.io"/>
17+
</arguments>
18+
<selectOption selector="{{AdminCurrencyRatesSection.rateService}}" userInput="{{rateService}}" stepKey="selectRateService"/>
19+
<waitForElementClickable selector="{{AdminCurrencyRatesSection.import}}" stepKey="waitToClickImport"/>
20+
<click selector="{{AdminCurrencyRatesSection.import}}" stepKey="clickImport"/>
21+
<waitForElementVisible selector="{{AdminCurrencyRatesSection.oldRate}}" stepKey="waitForOldRateVisible"/>
22+
</actionGroup>
23+
</actionGroups>

app/code/Magento/Directory/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<description>Go to the currency setup admin configuration page.</description>
1414
</annotations>
1515
<amOnPage url="{{AdminCurrencySetupPage.url}}" stepKey="goToCurrencySetupPage"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
1617
</actionGroup>
1718
</actionGroups>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCurrencyRatesSection">
12+
<element name="import" type="button" selector="//button[@title='Import']"/>
13+
<element name="oldRateLabel" type="text" selector="//div[contains(@class, 'admin__field-note') and contains(text(), 'Old rate:')]"/>
14+
<element name="rateService" type="select" selector="#rate_services"/>
15+
</section>
16+
</sections>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCurrencySetupSection">
12+
<element name="defaultCurrency" type="select" selector="#currency_options_default"/>
13+
<element name="defaultdisplayCurrency" type="select" selector="#currency_options_default_inherit"/>
14+
</section>
15+
</sections>

0 commit comments

Comments
 (0)