From d956729609fb37a788304e115b03da9cc442f4d5 Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Fri, 27 Apr 2018 17:25:12 +0300 Subject: [PATCH 1/2] MSI-933: [Configuration-Sources] Pagination worked in Manage Sources grid - Admin user --- .../Page/AdminManageSourcesPage.xml | 1 + .../Section/AdminManageSourcesGridSection.xml | 3 + ...aginationWorkedInManageSourcesGridTest.xml | 76 +++++++++++++++++++ .../Test/Acceptance/Data/ConstData.xml | 16 ++++ .../Test/Acceptance/Data/MsiSourceData.xml | 10 +++ 5 files changed, 106 insertions(+) create mode 100644 app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml create mode 100644 app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml diff --git a/app/code/Magento/Inventory/Test/Acceptance/Page/AdminManageSourcesPage.xml b/app/code/Magento/Inventory/Test/Acceptance/Page/AdminManageSourcesPage.xml index fdad09abaac07..063c84458a040 100644 --- a/app/code/Magento/Inventory/Test/Acceptance/Page/AdminManageSourcesPage.xml +++ b/app/code/Magento/Inventory/Test/Acceptance/Page/AdminManageSourcesPage.xml @@ -15,6 +15,7 @@
+
diff --git a/app/code/Magento/Inventory/Test/Acceptance/Section/AdminManageSourcesGridSection.xml b/app/code/Magento/Inventory/Test/Acceptance/Section/AdminManageSourcesGridSection.xml index a22829f10e733..27072a1420015 100644 --- a/app/code/Magento/Inventory/Test/Acceptance/Section/AdminManageSourcesGridSection.xml +++ b/app/code/Magento/Inventory/Test/Acceptance/Section/AdminManageSourcesGridSection.xml @@ -8,6 +8,9 @@ +
+ +
diff --git a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml new file mode 100644 index 0000000000000..bb0e280908ac9 --- /dev/null +++ b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml @@ -0,0 +1,76 @@ + + + + + + + + + + <description value="You should be able to switch between pages on Manage Sources grid"/> + <testCaseId value="933"/> + <severity value="CRITICAL"/> + <group value="msi"/> + </annotations> + + <before> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource1"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource2"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource3"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource4"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource5"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource6"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource7"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource8"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource9"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource10"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource11"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource12"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource13"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource14"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource15"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource16"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource17"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource18"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource19"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource20"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource21"/> + <createData entity="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" stepKey="createSource22"/> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> + </before> + + <after> + <actionGroup ref="logout" stepKey="logoutOfAdmin1"/> + </after> + + <amOnPage url="{{AdminManageSourcePage.url}}" stepKey="amOnTheManageSourcePage1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> + <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad2"/> + <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSearchResults1"> + <argument name="selector" value="AdminManageSourcesGridFilterControls.code"/> + <!--TODO Change this to scalar when MQE-498 is implemented--> + <argument name="value" value="TemporaryConsts.special_source"/> + </actionGroup> + <waitForPageLoad time="30" stepKey="waitForPageLoad3"/> + <actionGroup ref="adminDataGridSelectPerPage" stepKey="select20SourcesPerPage1"> + <!--TODO Change this to scalar when MQE-498 is implemented--> + <argument name="perPage" value="TemporaryConsts.twenty"/> + </actionGroup> + <waitForPageLoad time="30" stepKey="waitForPageLoad4"/> + <see selector="{{AdminDataGridPaginationSection.totalPages}}" userInput="2" stepKey="seeTotalPages1"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="seeNumberOfRows1"/> + <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="goToNextPage1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad5"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="2" stepKey="seeNumberOfRows2"/> + <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="goTopreviousPage1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad6"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="seeNumberOfRows3"/> + </test> +</tests> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml new file mode 100644 index 0000000000000..40051be43f80b --- /dev/null +++ b/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"> + <!--TODO Remove when MQE-498 is implemented--> + <entity name="TemporaryConsts" type="constant"> + <data key="twenty">20</data> + <data key="special_source">special_source</data> + </entity> +</entities> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml index 881b0d8ab015e..e3190cbf38434 100644 --- a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml +++ b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml @@ -75,4 +75,14 @@ <data key="postcode">QC G2E 6J5</data> <data key="use_default_carrier_config">1</data> </entity> + <!-- Please don't use this entity in your tests --> + <entity name="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" type="source"> + <data key="id_field_name">source_code</data> + <data key="name" unique="suffix">Special Source </data> + <data key="source_code" unique="suffix">special_source_</data> + <data key="enabled">1</data> + <data key="country_id">US</data> + <data key="postcode">90230</data> + <data key="use_default_carrier_config">1</data> + </entity> </entities> From 417d393a41d9f6597694ffe44f9ab9a142499a7f Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky <p.bystritsky@yandex.ru> Date: Tue, 8 May 2018 17:03:08 +0300 Subject: [PATCH 2/2] MSI-933: [Configuration-Sources] Pagination worked in Manage Sources grid - Admin user. --- ...aginationWorkedInManageSourcesGridTest.xml | 32 +++++++++---------- .../Test/Acceptance/Data/ConstData.xml | 16 ---------- .../Test/Acceptance/Data/MsiSourceData.xml | 2 +- .../AdminDataGridPaginationActionGroup.xml | 2 +- ...dminGridFilterSearchResultsActionGroup.xml | 2 +- 5 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml diff --git a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml index bb0e280908ac9..d405df4268ad9 100644 --- a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml +++ b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminPaginationWorkedInManageSourcesGridTest.xml @@ -49,28 +49,26 @@ <actionGroup ref="logout" stepKey="logoutOfAdmin1"/> </after> - <amOnPage url="{{AdminManageSourcePage.url}}" stepKey="amOnTheManageSourcePage1"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> + <amOnPage url="{{AdminManageSourcePage.url}}" stepKey="amOnTheManageSourcePage"/> + <waitForPageLoad time="30" stepKey="waitForAdminManageSourcePageLoad"/> <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters1"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad2"/> - <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSearchResults1"> + <waitForPageLoad time="30" stepKey="waitFilterCleared"/> + <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSearchResults"> <argument name="selector" value="AdminManageSourcesGridFilterControls.code"/> - <!--TODO Change this to scalar when MQE-498 is implemented--> - <argument name="value" value="TemporaryConsts.special_source"/> + <argument name="value" value="special_source"/> </actionGroup> - <waitForPageLoad time="30" stepKey="waitForPageLoad3"/> - <actionGroup ref="adminDataGridSelectPerPage" stepKey="select20SourcesPerPage1"> - <!--TODO Change this to scalar when MQE-498 is implemented--> - <argument name="perPage" value="TemporaryConsts.twenty"/> + <waitForPageLoad time="30" stepKey="waitFilterApplied"/> + <actionGroup ref="adminDataGridSelectPerPage" stepKey="select20SourcesPerPage"> + <argument name="perPage" value="20"/> </actionGroup> - <waitForPageLoad time="30" stepKey="waitForPageLoad4"/> - <see selector="{{AdminDataGridPaginationSection.totalPages}}" userInput="2" stepKey="seeTotalPages1"/> - <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="seeNumberOfRows1"/> + <waitForPageLoad time="30" stepKey="waitSelectPerPageApplied"/> + <see selector="{{AdminDataGridPaginationSection.totalPages}}" userInput="2" stepKey="seeTotalPages"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="checkNumberOfRowsOnFirstPage"/> <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="goToNextPage1"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad5"/> - <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="2" stepKey="seeNumberOfRows2"/> + <waitForPageLoad time="30" stepKey="waitNextGridPageOpened"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="2" stepKey="checkNumberOfRowsOnSecondPage"/> <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="goTopreviousPage1"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad6"/> - <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="seeNumberOfRows3"/> + <waitForPageLoad time="30" stepKey="waitPrevGridPageOpened"/> + <seeNumberOfElements selector="{{AdminManageSourcesGridBody.dataRows}}" userInput="20" stepKey="checkNumberOfRowsOnFirstPageAgain"/> </test> </tests> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml deleted file mode 100644 index 40051be43f80b..0000000000000 --- a/app/code/Magento/InventoryApi/Test/Acceptance/Data/ConstData.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd"> - <!--TODO Remove when MQE-498 is implemented--> - <entity name="TemporaryConsts" type="constant"> - <data key="twenty">20</data> - <data key="special_source">special_source</data> - </entity> -</entities> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml index e3190cbf38434..878025a45cfaf 100644 --- a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml +++ b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiSourceData.xml @@ -75,7 +75,7 @@ <data key="postcode">QC G2E 6J5</data> <data key="use_default_carrier_config">1</data> </entity> - <!-- Please don't use this entity in your tests --> + <!-- Please don't use this entity in your tests otherwise AdminPaginationWorkedInManageSourcesGridTest will fail --> <entity name="SpecialSourceForAdminPaginationWorkedInManageSourcesGridTest" type="source"> <data key="id_field_name">source_code</data> <data key="name" unique="suffix">Special Source </data> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml index ee981e06f4983..721eca1a2cd27 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> <actionGroup name="adminDataGridSelectPerPage"> <arguments> - <argument name="perPage"/> + <argument name="perPage" type="string"/> </arguments> <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/> <click selector="{{AdminDataGridPaginationSection.perPageOption(perPage)}}" stepKey="selectCustomPerPage"/> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml index 459ad5070da01..02db11829f0fc 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml @@ -11,7 +11,7 @@ <actionGroup name="AdminGridFilterSearchResultsByInput"> <arguments> <argument name="selector"/> - <argument name="value"/> + <argument name="value" type="string"/> </arguments> <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>