Skip to content

Commit f6c502c

Browse files
committed
Merge branch 'ACQE-6695' into ACQE-6903
2 parents 8034a67 + 06a070c commit f6c502c

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/TierPricingWhenPriceScopeIsWebsiteWorkingProperlyWithMultipleCurrenciesConfiguredTest.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
<argument name="customStore" value="NewStoreViewData"/>
3939
</actionGroup>
4040
<amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage1"/>
41-
<click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="openCurrencyOptions"/>
41+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptions"/>
42+
<conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.CheckCurrencyOptionsIfTabExpand}}" stepKey="openCurrencyOptions" visible="true"/>
43+
<waitForElementVisible selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="waitForUseDefaultCheckbox"/>
44+
<uncheckOption selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="uncheckUseDefaultOption"/>
4245
<selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="Swedish Krona" stepKey="setBaseCurrencyField"/>
4346
<selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
4447
<click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
@@ -63,7 +66,6 @@
6366
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
6467
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
6568
<waitForPageLoad stepKey="waitForPageLoad8"/>
66-
6769
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPage"/>
6870
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="revertCurrencyRates1">
6971
<argument name="firstCurrency" value="EUR"/>
@@ -176,20 +178,20 @@
176178
</actionGroup>
177179
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText">
178180
<argument name="tierProductPriceDiscountQuantity" value="10"/>
179-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.84"/>
180-
<argument name="productSavedPricePercent" value="92"/>
181+
<argument name="productPriceWithAppliedTierPriceDiscount" value="9.00"/>
182+
<argument name="productSavedPricePercent" value="10"/>
181183
<argument name="index" value="1"/>
182184
</actionGroup>
183185
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText2">
184186
<argument name="tierProductPriceDiscountQuantity" value="20"/>
185-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.74"/>
186-
<argument name="productSavedPricePercent" value="93"/>
187+
<argument name="productPriceWithAppliedTierPriceDiscount" value="8.00"/>
188+
<argument name="productSavedPricePercent" value="20"/>
187189
<argument name="index" value="2"/>
188190
</actionGroup>
189191
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText3">
190192
<argument name="tierProductPriceDiscountQuantity" value="30"/>
191-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.65"/>
192-
<argument name="productSavedPricePercent" value="94"/>
193+
<argument name="productPriceWithAppliedTierPriceDiscount" value="7.00"/>
194+
<argument name="productSavedPricePercent" value="30"/>
193195
<argument name="index" value="3"/>
194196
</actionGroup>
195197
</test>

0 commit comments

Comments
 (0)