Merge remote-tracking branch 'honey/MAGETWO-95111-Creating-new-storeview-validation' into BugFixPR

Author: joanhe

app/code/Magento/Backend/view/adminhtml/web/js/validate-store.js

@@ -67,6 +67,7 @@ define([
                              * 'Confirm' action handler.
                              */
                             confirm: function () {
+                                $('body').trigger('processStart');
                                 dataPost().postData(requestData);
                             }
                         }

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml

@@ -24,7 +24,17 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+    </actionGroup>
+    <!--Save the Store view-->
+    <actionGroup name="AdminCreateStoreViewActionSaveGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload2"/>
         <see userInput="You saved the store view." stepKey="seeSavedMessage" />
     </actionGroup>
+    <!--Save the same Store view code for code validation-->
+    <actionGroup name="AdminCreateStoreViewCodeUniquenessActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForForm"/>
+        <see userInput="Store with the same code already exists." stepKey="seeMessage" />
+    </actionGroup>
 </actionGroups>

app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml

@@ -11,5 +11,6 @@
         <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
         <element name="saveButton" type="button" selector="#save" timeout="60"/>
+        <element name="loadingMask" type="text" selector=".loading-mask"/>
     </section>
 </sections>

app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml

@@ -15,15 +15,25 @@
                 <description value="Admin should be able to create a store view"/>
                 <group value="storeView"/>
                 <severity value="AVERAGE"/>
+                <testCaseId value="MAGETWO-95111"/>
             </annotations>
             <before>
                 <actionGroup ref="LoginActionGroup" stepKey="login"/>
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+                <!--<createData stepKey="b2" entity="customStoreGroup"/>-->
             </before>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
-            <!--Confirm new store view on Store Grid-->
+            <!--Save store view on Store Grid-->
+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="createStoreViewSave" />
+            <!--Confirm new store view created on Store Grid-->
             <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilter"/>
             <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch" />
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <see selector="{{AdminStoresGridSection.storeNameInFirstRow}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView" />
+            <!--Creating the same store view to validate the code uniqueness on store form-->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2" />
+            <actionGroup ref="AdminCreateStoreViewCodeUniquenessActionGroup" stepKey="createStoreViewCode" />
+            <after>
+                <actionGroup ref="logout" stepKey="logout"/>
+            </after>
         </test>
 </tests>