From e38bc287c6f31a8c661bdd280ea657953db66498 Mon Sep 17 00:00:00 2001 From: RomanKis Date: Tue, 8 May 2018 11:02:30 +0300 Subject: [PATCH 1/2] MSI-858: [Configuration-Stocks] Admin user applied Mass action: Delete in Manage Stocks grid --- ...nAllStocksDeletedFromGridExceptDefault.xml | 44 +++++++++++++++++++ .../Test/Acceptance/Data/MsiStockData.xml | 3 ++ .../Ui/Section/AdminGridControlsSection.xml | 12 +++++ .../Ui/Section/AdminMessagesSection.xml | 15 +++++++ 4 files changed, 74 insertions(+) create mode 100644 app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminMessagesSection.xml diff --git a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml new file mode 100644 index 0000000000000..9ce75a2831691 --- /dev/null +++ b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml @@ -0,0 +1,44 @@ + + + + + + + + + + <description value="You should be able to Delete all Stocks from the Grid except Default if it does NOT have a Sales Channel assigned."/> + <testCaseId value="858"/> + <severity value="CRITICAL"/> + <group value="msi"/> + </annotations> + + <before> + <createData entity="BasicMsiStock1" stepKey="createStock1"/> + <createData entity="BasicMsiStock2" stepKey="createStock2"/> + <createData entity="BasicMsiStock3" stepKey="createStock3"/> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> + <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnStockListPage1"/> + <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> + </before> + <after> + <actionGroup ref="logout" stepKey="logoutOfAdmin1"/> + </after> + + <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdown"/> + <click selector="{{AdminGridSelectRows.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/> + <click selector="{{AdminGridSelectRows.bulkActionDropdown}}" stepKey="clickActionDropdown"/> + <click selector="{{AdminGridSelectRows.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/> + <waitForElementVisible selector="{{AdminGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/> + <click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/> + + <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted 3 Stock(s)." stepKey="seeSuccessDeleteMessage1"/> + <see selector="{{AdminMessagesSection.errorMessage}}" userInput="[ID: 1] Default Stock could not be deleted." stepKey="seeErrorDeleteMessage1"/> + </test> +</tests> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml index 907a92fc168a3..9a163e1da616a 100644 --- a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml +++ b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml @@ -18,4 +18,7 @@ <entity name="BasicMsiStock2" type="stock"> <data key="name" unique="suffix">Basic MSI Stock 2 </data> </entity> + <entity name="BasicMsiStock3" type="stock"> + <data key="name" unique="suffix">Basic MSI Stock 3 </data> + </entity> </entities> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml index 91bf1001a40c1..f37f7d6eccf98 100644 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml @@ -65,4 +65,16 @@ <element name="checkboxByValue" type="checkbox" selector="//input[ancestor::tr[contains(., '{{var1}}')]]" parameterized="true"/> <element name="checkboxByIndex" type="checkbox" selector=".data-row[data-repeat-index='{{var1}}'] .admin__control-checkbox" parameterized="true"/> </section> + <section name="AdminGridSelectRows"> + <element name="multicheckDropdown" type="button" selector="div[data-role='grid-wrapper'] th.data-grid-multicheck-cell button.action-multicheck-toggle"/> + <element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/> + <element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/> + <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/> + </section> + <section name="AdminGridConfirmActionSection"> + <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/> + <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/> + <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/> + <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/> + </section> </sections> diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminMessagesSection.xml new file mode 100644 index 0000000000000..a727104f48014 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminMessagesSection.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> + <section name="AdminMessagesSection"> + <element name="successMessage" type="text" selector=".message-success"/> + <element name="errorMessage" type="text" selector=".message.message-error.error"/> + </section> +</sections> From 7416259f5339ee3738cf630e3862e954fc8e6a2f Mon Sep 17 00:00:00 2001 From: RomanKis <romaikiss@gmail.com> Date: Tue, 8 May 2018 16:03:10 +0300 Subject: [PATCH 2/2] MSI-858: [Configuration-Stocks] Admin user applied Mass action: Delete in Manage Stocks grid --- ...nAllStocksDeletedFromGridExceptDefault.xml | 29 ++++++++++++++----- .../Test/Acceptance/Data/MsiStockData.xml | 3 -- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml index 9ce75a2831691..56b1ac7e40a73 100644 --- a/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml +++ b/app/code/Magento/Inventory/Test/Acceptance/Test/AdminAllStocksDeletedFromGridExceptDefault.xml @@ -20,15 +20,28 @@ </annotations> <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + + <!-- need to delete all stocks previously created --> + <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnStockGridPageToDeleteAllNeedlesslyStocks"/> + <waitForPageLoad time="30" stepKey="waitForStockGridLoadToDeleteAllNeedlesslyStocks"/> + <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearAllFilters"/> + <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdownToDeleteAllNeedlesslyStocks"/> + <click selector="{{AdminGridSelectRows.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGridToDeleteAllNeedlesslyStocks"/> + <click selector="{{AdminGridSelectRows.bulkActionDropdown}}" stepKey="clickActionDropdownToDeleteAllNeedlesslyStocks"/> + <click selector="{{AdminGridSelectRows.bulkActionOption('Delete')}}" stepKey="clickDeleteActionToDeleteAllNeedlesslyStocks"/> + <waitForElementVisible selector="{{AdminGridConfirmActionSection.title}}" stepKey="waitForConfirmModalToDeleteAllNeedlesslyStocks"/> + <click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="confirmStocksDeleteToDeleteAllNeedlesslyStocks"/> + <createData entity="BasicMsiStock1" stepKey="createStock1"/> <createData entity="BasicMsiStock2" stepKey="createStock2"/> - <createData entity="BasicMsiStock3" stepKey="createStock3"/> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnStockListPage1"/> - <waitForPageLoad time="30" stepKey="waitForPageLoad1"/> + <createData entity="BasicMsiStock2" stepKey="createStock3"/> + + <amOnPage url="{{AdminManageStockPage.url}}" stepKey="amOnStockGridPage"/> + <waitForPageLoad time="30" stepKey="waitForStockGridLoad"/> </before> <after> - <actionGroup ref="logout" stepKey="logoutOfAdmin1"/> + <actionGroup ref="logout" stepKey="logoutOfAdmin"/> </after> <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdown"/> @@ -36,9 +49,9 @@ <click selector="{{AdminGridSelectRows.bulkActionDropdown}}" stepKey="clickActionDropdown"/> <click selector="{{AdminGridSelectRows.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/> <waitForElementVisible selector="{{AdminGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/> - <click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/> + <click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="confirmStocksDelete"/> - <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted 3 Stock(s)." stepKey="seeSuccessDeleteMessage1"/> - <see selector="{{AdminMessagesSection.errorMessage}}" userInput="[ID: 1] Default Stock could not be deleted." stepKey="seeErrorDeleteMessage1"/> + <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted 3 Stock(s)." stepKey="seeSuccessDeleteMessage"/> + <see selector="{{AdminMessagesSection.errorMessage}}" userInput="[ID: 1] Default Stock could not be deleted." stepKey="seeErrorDeleteMessage"/> </test> </tests> diff --git a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml index 9a163e1da616a..907a92fc168a3 100644 --- a/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml +++ b/app/code/Magento/InventoryApi/Test/Acceptance/Data/MsiStockData.xml @@ -18,7 +18,4 @@ <entity name="BasicMsiStock2" type="stock"> <data key="name" unique="suffix">Basic MSI Stock 2 </data> </entity> - <entity name="BasicMsiStock3" type="stock"> - <data key="name" unique="suffix">Basic MSI Stock 3 </data> - </entity> </entities>