Skip to content

Commit 72d05f9

Browse files
committed
B2B-2139: [AWS S3] Flaky Tests: StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest & StorefrontAutoGeneratedCouponCodeTest & AdminContentThemesEditTest
- Fixing flaky tests
1 parent 302f6c5 commit 72d05f9

File tree

6 files changed

+28
-5
lines changed

6 files changed

+28
-5
lines changed

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
1717
<click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<see userInput="You are signed out" stepKey="signOut"/>
19+
<waitForText userInput="You are signed out" stepKey="signOut"/>
2020
</actionGroup>
2121
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="createNewCustomerAccount">
6363
<argument name="customer" value="Simple_US_Customer" />
6464
</actionGroup>
65-
<click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
66-
<waitForPageLoad stepKey="waitForCreateAccountButtonToLoad"/>
65+
<actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAccountButton"/>
66+
<comment userInput="BIC workaround" stepKey="waitForCreateAccountButtonToLoad"/>
6767

6868
<!--Assert customer information-->
6969
<see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSignOutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
1717
<click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<see userInput="You are signed out" stepKey="signOut"/>
19+
<waitForText userInput="You are signed out" stepKey="signOut"/>
2020
</actionGroup>
2121
</actionGroups>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminClickViewThemeBySpecifiedThemeActionGroup">
12+
<annotations>
13+
<description>Click the 'View' action of the specified theme on the themes grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="theme" defaultValue="{{MagentoBlankTheme.themeTitle}}" type="string"/>
17+
</arguments>
18+
<click selector="{{AdminThemeSection.viewActionByTheme(theme)}}" stepKey="clickViewTheme"/>
19+
</actionGroup>
20+
</actionGroups>

app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<element name="gridCellUpdated" type="text" selector="//tbody//tr//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
2020
<element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
2121
<element name="viewAction" type="button" selector="tr.data-row > td.data-grid-actions-cell > a.action-menu-item"/>
22+
<element name="viewActionByTheme" type="button" selector="//tr[@class='data-row']//td//div[@class='data-grid-cell-content' and text()='{{theme}}']//ancestor::tr//td[@class='data-grid-actions-cell']/a[@class='action-menu-item']" parameterized="true"/>
2223
</section>
2324
</sections>

app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesEditTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
<argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
3333
</actionGroup>
3434

35-
<actionGroup ref="AdminClickViewThemeActionGroup" stepKey="editTheme"/>
35+
<actionGroup ref="AdminClickViewThemeBySpecifiedThemeActionGroup" stepKey="editTheme">
36+
<argument name="title" value="{{MagentoBlankTheme.themeTitle}}"/>
37+
</actionGroup>
3638

3739
<actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seeEditPageTitle">
3840
<argument name="title" value="{{MagentoBlankTheme.pageTitle}}"/>

0 commit comments

Comments
 (0)