Merge remote-tracking branch 'remotes/github/MAGETWO-70803' into EPAM-PR-73

Author: VeronikaYarats

app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml

@@ -46,11 +46,18 @@
         <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{validationNoticeMessage}}" after="waitForValidationNoticeMessage" stepKey="seeValidationNoticeMessage"/>
         <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{validationMessage}}" after="seeValidationNoticeMessage" stepKey="seeValidationMessage"/>
     </actionGroup>
-    <actionGroup name="checkDataForImportProductActionGroup" extends="AdminImportProductsActionGroup">
-        <remove keyForRemoval="clickImportButton"/>
-        <remove keyForRemoval="AdminImportMainSectionLoad2"/>
-        <remove keyForRemoval="assertSuccessMessage"/>
-        <remove keyForRemoval="AdminMessagesSection"/>
-        <remove keyForRemoval="seeImportMessage"/>
+    <actionGroup name="AdminCheckDataForImportProductActionGroup">
+        <arguments>
+            <argument name="behavior" type="string" defaultValue="Add/Update"/>
+            <argument name="importFile" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <waitForPageLoad stepKey="adminImportMainSectionLoad"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportBehaviorOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml

@@ -20,27 +20,21 @@
         </annotations>
         <before>
             <!--Login as Admin-->
-            <comment userInput="Login as Admin" stepKey="commentLogin"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <!--Logout from Admin-->
-            <comment userInput="Logout from Admin" stepKey="commentLogout"/>
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <!--Check data products with add/update behavior-->
-        <comment userInput="Check data products with add/update behavior" stepKey="commentCheckData"/>
-        <actionGroup ref="checkDataForImportProductActionGroup" stepKey="adminImportProducts">
+        <actionGroup ref="AdminCheckDataForImportProductActionGroup" stepKey="adminImportProducts">
             <argument name="behavior" value="Add/Update"/>
             <argument name="importFile" value="BB-ProductsWorking.csv"/>
-            <argument name="importMessage" value="Checked rows: 28, checked entities: 28, invalid rows: 0, total errors: 0"/>
         </actionGroup>
         <see selector="{{AdminImportMainSection.messageSuccess}}" userInput='File is valid! To start import process press "Import" button' stepKey="seeSuccessMessage"/>
-        <actionGroup ref="checkDataForImportProductActionGroup" stepKey="adminImportProducts1">
+        <actionGroup ref="AdminCheckDataForImportProductActionGroup" stepKey="adminImportProducts1">
             <argument name="behavior" value="Add/Update"/>
             <argument name="importFile" value="BB-Products.csv"/>
-            <argument name="importMessage" value="Checked rows: 117, checked entities: 115, invalid rows: 2, total errors: 2"/>
-            <argument name="checkMessage" value='Curly quotes used instead of straight quotes in row(s): 84, 85'/>
         </actionGroup>
         <see selector="{{AdminImportMainSection.messageError}}" userInput='Curly quotes used instead of straight quotes in row(s): 84, 85' stepKey="seeErrorMessage"/>
     </test>