Skip to content

Commit 36531bc

Browse files
committed
MAGETWO-97034: Import Products with Delete Entities
1 parent 1bd2542 commit 36531bc

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<element name="success" type="text" selector="#messages div.message-success"/>
1313
<element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
1414
<element name="error" type="text" selector="#messages div.message-error"/>
15+
<element name="notice" type="text" selector=".message.message-notice.notice"/>
1516
</section>
1617
</sections>

app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
<element name="importBehavior" type="select" selector="#basic_behavior"/>
1414
<element name="selectFileToImport" type="input" selector="#import_file"/>
1515
<element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
16-
<element name="noticeMessage" type="text" selector="#import_validation_messages .message.message-notice.notice"/>
1716
</section>
1817
</sections>

app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml renamed to app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminImportProductsWithDeleteEntitiesTest">
11+
<test name="AdminImportProductsWithDeleteBehaviorTest">
1212
<annotations>
1313
<description value="Verify Magento native import products with delete behavior."/>
1414
<stories value="Verify Magento native import products with delete behavior."/>
@@ -46,22 +46,20 @@
4646
<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Delete" stepKey="selectDeleteOption"/>
4747
<attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
4848
<click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
49-
<waitForAjaxLoad stepKey="waitForFileToImportProcessed"/>
5049
<click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
51-
<waitForAjaxLoad stepKey="waitForFileToImportProcessed1"/>
5250
<see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
53-
<see selector="{{AdminImportMainSection.noticeMessage}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNoticeMessage"/>
51+
<see selector="{{AdminMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
5452
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
5553
<argument name="product" value="$$createSimpleProduct$$"/>
5654
</actionGroup>
57-
<see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage"/>
55+
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
5856
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchVirtualProductOnBackend">
5957
<argument name="product" value="$$createVirtualProduct$$"/>
6058
</actionGroup>
61-
<see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage1"/>
59+
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage1"/>
6260
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
6361
<argument name="product" value="$$createDownloadableProduct$$"/>
6462
</actionGroup>
65-
<see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage2"/>
63+
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
6664
</test>
6765
</tests>

app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
1919
<element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
2020
<element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
21-
<element name="dataGridNoData" type="block" selector=".data-grid-tr-no-data td"/>
21+
<element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
2222
</section>
2323
</sections>

0 commit comments

Comments
 (0)