Skip to content

Commit a335eca

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-5193' into ACQE-6178_mainline_PR_development
2 parents 7540b07 + ace379e commit a335eca

File tree

5 files changed

+78
-0
lines changed

5 files changed

+78
-0
lines changed

‎app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml

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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminExpandCurrencyOptionsActionGroup">
12+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptionsSectionToBecomeClickable"/>
13+
<click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="openCurrencyOptions"/>
14+
</actionGroup>
15+
</actionGroups>

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

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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminNavigateToCurrencySetupPageActionGroup">
12+
<amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage1"/>
13+
<waitForPageLoad stepKey="waitForPageLoad"/>
14+
</actionGroup>
15+
</actionGroups>

‎app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!-- Set base currency -->
1212
<actionGroup name="AdminSetDefaultCurrencyActionGroup" extends="AdminSaveConfigActionGroup">
13+
<annotations>
14+
<description>Admin uncheck default currency option.</description>
15+
</annotations>
1316
<arguments>
1417
<argument name="currency" type="string"/>
1518
</arguments>

‎app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest">
12+
<annotations>
13+
<stories value="Currency Rates"/>
14+
<title value="Update currency rate for quotes in statuses Ordered and Closed"/>
15+
<description value="Update currency rate for created quotes in statuses Ordered and Closed"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="B2B-1506"/>
18+
</annotations>
19+
<before>
20+
<!--Login to backend-->
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<!--Setup currencies -->
23+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage"/>
24+
<actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/>
25+
<actionGroup ref="AdminSetBaseCurrencyActionGroup" stepKey="setBaseCurrencyUSD">
26+
<argument name="currency" value="US Dollar"/>
27+
</actionGroup>
28+
<selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="US Dollar" stepKey="setBaseCurrencyField"/>
29+
<uncheckOption selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="UnCheckUseDefaultOptionForAllowedCurrencies"/>
30+
<selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
31+
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
32+
<actionGroup ref="AdminSetDefaultCurrencyActionGroup" stepKey="setDefaultCurrencyEUR">
33+
<argument name="currency" value="Euro"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveStoreConfiguration"/>
36+
<!--<click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>-->
37+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
38+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
39+
<!--Go to Configuration -> Currency Setup-->
40+
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPage"/>
41+
<actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRates"/>
42+
</before>
43+
</test>
44+
</tests>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<element name="orderId" type="text" selector="|Order # (\d+)|"/>
2727
<element name="orderStatusUnderViewM" type="text" selector="//td//div[contains(text(),'{{product}}')]/../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
2828
<element name="orderStatusUnderViewS" type="text" selector="//tr//div[contains(text(),'{{product}}')]/../../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
29+
<element name="rateValue" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]/following-sibling::td"/>
2930
</section>
3031
</sections>

0 commit comments

Comments
 (0)