Skip to content

Commit 9ea7b8e

Browse files
shashikant.kumarshashikant.kumar
authored andcommitted
implementing review comment
1 parent 2305c2a commit 9ea7b8e

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
<element name="changeStoreConfigButton" type="button" selector="//button[@id='store-change-button']"/>
2222
<element name="changeStoreConfigToSpecificWebsite" type="select" selector="//a[contains(text(),'{{var}}')]" parameterized="true"/>
2323
<element name="changeWebsiteConfirmButton" type="button" selector="//button[@class='action-primary action-accept']/span"/>
24-
<element name="checkboxTimeZone" type="checkbox" selector="//input[@id='general_locale_timezone_inherit']"/>
2524
</section>
2625
</sections>

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminChangeTimeZoneForDifferentWebsiteActionGroup.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<argument name="timeZoneName" type="string"/>
1717
</arguments>
1818
<amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="navigateToLocaleConfigurationPage"/>
19-
<waitForPageLoad stepKey="waitForPageLoadPostNavigateToLocaleConfigurationPage"/>
19+
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
2020
<click selector="{{LocaleOptionsSection.changeStoreConfigButton}}" stepKey="changeStoreButton"/>
21-
<wait time="10" stepKey="waitForStoreOption"/>
21+
<waitForPageLoad stepKey="waitForStoreOption"/>
2222
<click selector="{{LocaleOptionsSection.changeStoreConfigToSpecificWebsite(websiteName)}}" stepKey="selectNewWebsite"/>
23-
<wait time="10" stepKey="waitForWebsiteChange"/>
23+
<waitForPageLoad stepKey="waitForWebsiteChange"/>
2424
<!-- Accept the current popup visible on the page. -->
2525
<click selector="{{LocaleOptionsSection.changeWebsiteConfirmButton}}" stepKey="confirmModal"/>
26-
<wait time="10" stepKey="waitForPageToApplyConfig"/>
27-
<conditionalClick stepKey="expandDefaultLayouts" selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.checkIfTabExpand}}" visible="true"/>
28-
<click selector="{{LocaleOptionsSection.checkboxTimeZone}}" stepKey="unCheckCheckbox"/>
26+
<waitForPageLoad stepKey="waitForSaveChange"/>
27+
<conditionalClick stepKey="expandDefaultLayouts" selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.CheckIfTabExpand}}" visible="true"/>
28+
<click selector="{{LocaleOptionsSection.useDefault}}" stepKey="unCheckCheckbox"/>
2929
<waitForElementVisible selector="{{LocaleOptionsSection.timezone}}" stepKey="waitForLocaleTimeZone"/>
3030
<selectOption userInput="{{timeZoneName}}" selector="{{LocaleOptionsSection.timeZoneDropdown}}" stepKey="selectDefaultOption"/>
3131
</actionGroup>

app/code/Magento/Sales/Test/Mftf/Test/OrderDataGridDisplaysPurchaseDateTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
8+
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="OrderDataGridDisplaysPurchaseDateTest">
@@ -70,7 +70,7 @@
7070
<argument name="Customer" value="$$createCustomer$$" />
7171
</actionGroup>
7272
</before>
73-
73+
7474
<after>
7575
<!-- Disabled Store URLs -->
7676
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="setAddStoreCodeToUrlsToNo"/>
@@ -120,7 +120,7 @@
120120
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
121121
<!-- Click Place Order button -->
122122
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
123-
<!-- capture date at time of Placeing Order -->
123+
<!-- capture date at time of Placing Order -->
124124
<generateDate date="+2 hour" format="M j, Y" stepKey="generateDateAtFirstOrderTime"/>
125125
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabFirstOrderNumber"/>
126126
<amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
@@ -151,7 +151,7 @@
151151
<!-- Click Place Order button -->
152152
<wait time="75" stepKey="waitBeforePlaceOrder"/>
153153
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrderSecondTime"/>
154-
<!-- capture date at time of Placeing Order -->
154+
<!-- capture date at time of Placing Order -->
155155
<generateDate date="+2 hour" format="M j, Y" stepKey="generateDateAtSecondOrderTime"/>
156156
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabSecondOrderNumber"/>
157157
<!-- Go to admin and check order status -->

0 commit comments

Comments
 (0)