Skip to content

Commit

Permalink
Feedback changes
Browse files Browse the repository at this point in the history
  • Loading branch information
konarshankar07 committed Aug 10, 2020
1 parent 804ed71 commit c0ca7cd
Show file tree
Hide file tree
Showing 27 changed files with 49 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
<actionGroup name="AssertAdminContainsMessageOrderCreatedByAdminActionGroup">
<annotations>
<description>Assert Admin Order page contains message about Order created by a Store Administrator.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
<actionGroup name="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
<annotations>
<description>Verify Login as Customer config section is not available by direct url.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
<actionGroup name="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup">
<annotations>
<description>Verify no Login as Customer config section available.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertLoginAsCustomerConfigVisibleActionGroup">
<actionGroup name="AssertAdminLoginAsCustomerConfigVisibleActionGroup">
<annotations>
<description>Verify Login as Customer config section available.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
<actionGroup name="AssertAdminLoginAsCustomerLogRecordActionGroup">
<annotations>
<description>Assert Login as Customer Log record is correct.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup">
<actionGroup name="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup">
<annotations>
<description>Verify Login as Customer config section isn't available.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup">
<actionGroup name="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup">
<annotations>
<description>Verify Storefront Order page contains message about Order created by a Store Administrator.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertCustomerOnStoreViewActionGroup">
<actionGroup name="AssertStorefrontCustomerOnStoreViewActionGroup">
<annotations>
<description>Assert Customer is on the provided Store View.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertLoginAsCustomerLoggedInActionGroup">
<actionGroup name="AssertStorefrontLoginAsCustomerLoggedInActionGroup">
<annotations>
<description>Verify Admin successfully logged in as Customer.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup">
<actionGroup name="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup">
<annotations>
<description>Verify Login as Customer notification banner present on page.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup">
<actionGroup name="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup">
<annotations>
<description>Verify Sticky Login as Customer notification banner present on page.</description>
</annotations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</actionGroup>

<!-- Assert Customer logged on on default store view -->
<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
<argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createCustomer.email$$"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@
<actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/>

<!-- Perform assertions -->
<actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
<actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
<argument name="rowNumber" value="4"/>
<argument name="adminId" value="1"/>
<argument name="customerId" value="$$createFirstCustomer.id$$"/>
</actionGroup>
<actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
<actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
<argument name="rowNumber" value="3"/>
<argument name="adminId" value="1"/>
<argument name="customerId" value="$$createSecondCustomer.id$$"/>
</actionGroup>
<actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
<actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
<argument name="rowNumber" value="2"/>
<argument name="adminId" value="$$createNewAdmin.id$$"/>
<argument name="customerId" value="$$createFirstCustomer.id$$"/>
</actionGroup>
<actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
<actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
<argument name="rowNumber" value="1"/>
<argument name="adminId" value="$$createNewAdmin.id$$"/>
<argument name="customerId" value="$$createSecondCustomer.id$$"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
</actionGroup>

<!-- Assert Customer logged on on custom store view -->
<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
<argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createCustomer.email$$"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
<actionGroup ref="AssertStorefrontCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
<argument name="storeViewName" value="{{customStore.name}}"/>
</actionGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@
<waitForPageLoad stepKey="waitForOrderPageLoad"/>

<!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
<actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
<argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
</actionGroup>
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
<actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
<argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
</actionGroup>

<!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
<actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
<argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
<argument name="adminUserFullName" value="Magento User"/>
</actionGroup>
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
<actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
<argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
<argument name="adminUserFullName" value="Magento User"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>

<!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
<actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
<argument name="orderId" value="{$grabOrderId}"/>
</actionGroup>

<!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
<actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
<argument name="orderId" value="{$grabOrderId}"/>
<argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabReorderId"/>

<!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
<actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
<argument name="orderId" value="${grabReorderId}"/>
</actionGroup>

<!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
<actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
<argument name="orderId" value="${grabReorderId}"/>
<argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
</after>

<amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
<actionGroup ref="AdminAssertLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
<actionGroup ref="AssertAdminLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>

<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultStoreView">
<argument name="storeViewName" value="'Default Store View'"/>
</actionGroup>
<actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
<actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>

<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultWebsite">
<argument name="storeViewName" value="'Main Website'"/>
</actionGroup>
<actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
<actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</actionGroup>

<!-- Assert correctly logged in as Customer -->
<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
<argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createCustomer.email$$"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</actionGroup>

<!-- Assert correctly logged in as First Customer -->
<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
<argument name="customerFullName" value="$$createFirstCustomer.firstname$$ $$createFirstCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
</actionGroup>
Expand All @@ -58,7 +58,7 @@
</actionGroup>

<!-- Assert correctly logged in as Second Customer -->
<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
<argument name="customerFullName" value="$$createSecondCustomer.firstname$$ $$createSecondCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
</actionGroup>

<!-- Assert no Login as Customer config section visible -->
<actionGroup ref="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
<actionGroup ref="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>

<!-- Assert Login as Customer config section is not available by direct url -->
<actionGroup ref="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
<actionGroup ref="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
stepKey="assertConfigNotAvailableDirectly"/>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<argument name="customerId" value="$$createCustomer.id$$"/>
</actionGroup>

<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
<argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createCustomer.email$$"/>
</actionGroup>
Expand All @@ -70,7 +70,7 @@
<argument name="orderId" value="$grabOrderId"/>
</actionGroup>

<actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
<actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
<argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
<argument name="customerEmail" value="$$createCustomer.email$$"/>
</actionGroup>
Expand Down
Loading

0 comments on commit c0ca7cd

Please sign in to comment.