Skip to content

Commit b6186ef

Browse files
committed
Merge remote-tracking branch 'origin/MFTF-green' into MFTF-green
2 parents 3ad72c6 + d08f583 commit b6186ef

File tree

48 files changed

+710
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+710
-132
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="StorefrontAssertOnCustomerLoginPageActionGroup">
12+
<annotations>
13+
<description>Assert on the Storefront Customer Sign-In page.</description>
14+
</annotations>
15+
16+
<seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="seeOnSignInPage"/>
17+
</actionGroup>
18+
</actionGroups>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
1212
<annotations>
13-
<description>Verify Login As Customer config section is not available by direct url.</description>
13+
<description>Verify Login as Customer config section is not available by direct url.</description>
1414
</annotations>
1515

1616
<amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
1717
<waitForPageLoad stepKey="waitForPageLoad"/>
1818
<seeInCurrentUrl url="admin/system_config/index" stepKey="seeRedirectToConfigIndexPage"/>
19-
<dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
19+
<dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomer"/>
2020
</actionGroup>
2121
</actionGroups>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
1212
<annotations>
13-
<description>Verify no Login As Customer config section available.</description>
13+
<description>Verify no Login as Customer config section available.</description>
1414
</annotations>
1515

1616
<!-- TODO: update -->
17-
<dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomerItem"/>
17+
<dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomerItem"/>
1818
</actionGroup>
1919
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminAssertLoginAsCustomerConfigVisibleActionGroup">
12+
<annotations>
13+
<description>Verify Login as Customer config section available.</description>
14+
</annotations>
15+
16+
<seeElement selector="{{AdminCustomerConfigSection.loginAsCustomerSettingsHead}}" stepKey="seeLoginAsCustomerSettingsHead"/>
17+
<seeElement selector="{{AdminCustomerConfigSection.enableExtensionLabel}}" stepKey="seeEnableExtensionLabel"/>
18+
<seeElement selector="{{AdminCustomerConfigSection.disablePageCacheLabel}}" stepKey="seeDisablePageCacheLabel"/>
19+
<seeElement selector="{{AdminCustomerConfigSection.storeViewToLoginToLabel}}" stepKey="seeStoreViewToLoginToLabel"/>
20+
</actionGroup>
21+
</actionGroups>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
1212
<annotations>
13-
<description>Assert Login As Customer Log record is correct.</description>
13+
<description>Assert Login as Customer Log record is correct.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="rowNumber" type="string"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup">
12+
<annotations>
13+
<description>Verify Login as Customer config section isn't available.</description>
14+
</annotations>
15+
16+
<conditionalClick selector="{{CaptchaFormsDisplayingSection.customer}}" dependentSelector="{{AdminCustomerConfigSection.loginAsCustomerSettingsSectionLink}}" visible="false" stepKey="expandCustomerGroup"/>
17+
<dontSeeElement selector="{{AdminCustomerConfigSection.loginAsCustomerSettingsSectionLink}}" stepKey="dontSeeLoginAsCustomerSettingsLink"/>
18+
</actionGroup>
19+
</actionGroups>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminFilterLoginAsCustomerLogActionGroup">
1212
<annotations>
13-
<description>Filter Login As Customer Log records.</description>
13+
<description>Filter Login as Customer Log records.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="adminId" type="string"/>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup">
1212
<annotations>
13-
<description>Verify Login As Customer Login action is absent on Customer page.</description>
13+
<description>Verify Login as Customer Login action is absent on Customer page.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="customerId" type="string"/>
1717
</arguments>
1818

1919
<amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
2020
<waitForPageLoad stepKey="waitForCustomerPageLoad"/>
21-
<dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
21+
<dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomer"/>
2222
</actionGroup>
2323
</actionGroups>

app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)