From eeb47dda71907f4ce52928656455d733c4c42e8b Mon Sep 17 00:00:00 2001 From: Eden Date: Sat, 3 Oct 2020 08:51:36 +0700 Subject: [PATCH 1/7] Login As Customer Log - Logged In must be DateRange Filter instead of Text filter, Date display wrong timezone issue30328 --- .../adminhtml/ui_component/login_as_customer_log_listing.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml index fdd1bf55c91b9..29c53f37746f4 100644 --- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml +++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml @@ -83,9 +83,10 @@ - + - text + dateRange + date From b4f57841250d1d0448329a2de006883d024faf88 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" Date: Fri, 23 Oct 2020 16:53:39 +0300 Subject: [PATCH 2/7] MFTF has been added --- .../AdminLoginAsCustomerLogToolbarSection.xml | 6 +- .../AdminLoginAsCustomerLoggingFilterTest.xml | 67 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml index a403367ee0d02..fdb684db8c804 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml @@ -10,7 +10,11 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
- + + + + +
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml new file mode 100644 index 0000000000000..890c58c03a08d --- /dev/null +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -0,0 +1,67 @@ + + + + + + + + + + <description value="Filter by date should be from/to"/> + <severity value="MAJOR"/> + <group value="login_as_customer"/> + <testCaseId value="MC-"/> + </annotations> + <before> + <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1" + stepKey="enableLoginAsCustomer"/> + <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0" + stepKey="enableLoginAsCustomerAutoDetection"/> + <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/> + <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/> + </before> + <after> + <!--Clean filters --> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" stepKey="CleanFiltersAfter"/> + <!-- Log out as Default Admin User --> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultAdmin"/> + <!-- Remove created data--> + <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/> + <!-- Set config back--> + <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" + stepKey="disableLoginAsCustomer"/> + <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/> + </after> + <!-- Login into First Customer account --> + <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" + stepKey="loginAsFirstCustomerByDefaultAdmin"> + <argument name="customerId" value="$$createFirstCustomer.id$$"/> + </actionGroup> + <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutFirstCustomerDefaultAdmin"/> + <!-- Navigate to Login as Customer Log page --> + <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/> + <!-- Setup date filters --> + <conditionalClick selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" + dependentSelector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" + visible="true" stepKey="CleanFiltersBefore"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.filters}}" stepKey="clickFilters"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerFrom}}" stepKey="clickFromDate"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickToToday"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerTo}}" stepKey="clickToDate"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickTodayDateAgain"/> + <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/> + <!-- Perform assertions --> + <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord"> + <argument name="rowNumber" value="1"/> + <argument name="adminId" value="1"/> + <argument name="customerId" value="$$createFirstCustomer.id$$"/> + </actionGroup> + </test> +</tests> From 85b410dc07558086eccadda71fe070801a88cccb Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Thu, 29 Oct 2020 15:50:57 +0200 Subject: [PATCH 3/7] Test refactoring. --- .../Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml index 890c58c03a08d..8ce4c9f8f2373 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -29,7 +29,7 @@ </before> <after> <!--Clean filters --> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" stepKey="CleanFiltersAfter"/> + <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterAfter"/> <!-- Log out as Default Admin User --> <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultAdmin"/> <!-- Remove created data--> @@ -48,9 +48,7 @@ <!-- Navigate to Login as Customer Log page --> <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/> <!-- Setup date filters --> - <conditionalClick selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" - dependentSelector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" - visible="true" stepKey="CleanFiltersBefore"/> + <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/> <click selector="{{AdminLoginAsCustomerLogToolbarSection.filters}}" stepKey="clickFilters"/> <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerFrom}}" stepKey="clickFromDate"/> <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickToToday"/> From 312d9d42c20fe792815326ebea259db41335c080 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Wed, 4 Nov 2020 12:56:28 +0200 Subject: [PATCH 4/7] Code refactoring --- .../Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml index 8ce4c9f8f2373..2e108ceb9ee49 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -23,7 +23,9 @@ stepKey="enableLoginAsCustomer"/> <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0" stepKey="enableLoginAsCustomerAutoDetection"/> - <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheBeforeTestRun"> + <argument name="tags" value="config"/> + </actionGroup> <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/> </before> @@ -37,7 +39,9 @@ <!-- Set config back--> <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/> - <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheAfterTestRun"> + <argument name="tags" value="config"/> + </actionGroup> </after> <!-- Login into First Customer account --> <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" From ef72f80076e9443c108a46e21f8d460814947ac0 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Thu, 5 Nov 2020 14:31:03 +0200 Subject: [PATCH 5/7] Test case id has been added. --- .../Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml index 2e108ceb9ee49..75c09447648dc 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -14,9 +14,9 @@ <stories value="Filter by date login as customer logs"/> <title value="Filter by date login as customer logs"/> <description value="Filter by date should be from/to"/> - <severity value="MAJOR"/> + <severity value="AVERAGE"/> <group value="login_as_customer"/> - <testCaseId value="MC-"/> + <testCaseId value="MC-38920"/> </annotations> <before> <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1" From a48886c62016c3ed6fd7b696cb39829715714751 Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Tue, 5 Jan 2021 10:25:11 +0200 Subject: [PATCH 6/7] Test refactoring --- .../Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml index 75c09447648dc..247877f84062b 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -23,9 +23,6 @@ stepKey="enableLoginAsCustomer"/> <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0" stepKey="enableLoginAsCustomerAutoDetection"/> - <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheBeforeTestRun"> - <argument name="tags" value="config"/> - </actionGroup> <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/> </before> @@ -39,9 +36,6 @@ <!-- Set config back--> <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/> - <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCacheAfterTestRun"> - <argument name="tags" value="config"/> - </actionGroup> </after> <!-- Login into First Customer account --> <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" From 0fa2b89c9ac37a6ce69ff726685b0554b95e595e Mon Sep 17 00:00:00 2001 From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com> Date: Tue, 5 Jan 2021 19:49:36 +0200 Subject: [PATCH 7/7] Test refactoring --- ...merLogFilterDatePickerTodayActionGroup.xml | 22 +++++++++++++++++++ .../AdminLoginAsCustomerLoggingFilterTest.xml | 11 +--------- 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup.xml diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup.xml new file mode 100644 index 0000000000000..3367f20fe304a --- /dev/null +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup"> + <annotations> + <description>Filter Login as Customer Log grid by current day.</description> + </annotations> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.filters}}" stepKey="clickFilters"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerFrom}}" stepKey="clickFromDate"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickToToday"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerTo}}" stepKey="clickToDate"/> + <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickTodayDateAgain"/> + <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml index 247877f84062b..592390c43bce7 100644 --- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml +++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingFilterTest.xml @@ -27,13 +27,9 @@ <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/> </before> <after> - <!--Clean filters --> <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterAfter"/> - <!-- Log out as Default Admin User --> <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultAdmin"/> - <!-- Remove created data--> <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/> - <!-- Set config back--> <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/> </after> @@ -47,12 +43,7 @@ <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/> <!-- Setup date filters --> <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.filters}}" stepKey="clickFilters"/> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerFrom}}" stepKey="clickFromDate"/> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickToToday"/> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerTo}}" stepKey="clickToDate"/> - <click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickTodayDateAgain"/> - <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/> + <actionGroup ref="AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup" stepKey="filterByToday"/> <!-- Perform assertions --> <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord"> <argument name="rowNumber" value="1"/>