From 321816680860cc7b9f1ef50e7a136e5a3a53af21 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 15 Mar 2019 14:16:16 +0200
Subject: [PATCH 1/6] MC-15404: Stabilize
 AdminAbleToShipPartiallyInvoicedItemsTest

---
 .../order/creditmemo/create/items.phtml       | 69 +++++++++++--------
 .../order/invoice/create/items.phtml          | 51 +++++++-------
 2 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index fcf4ccad7060b..ba4af32ff69b2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -136,67 +136,76 @@
 </section>
 
 <script>
-require(['jquery', 'prototype'], function(jQuery){
+require(['jquery'], function(jQuery){
 
 //<![CDATA[
-var submitButtons = $$('.submit-button');
-var updateButtons = $$('.update-button');
-var fields = $$('.qty-input');
+var submitButtons = jQuery('.submit-button');
+var updateButtons = jQuery('.update-button');
+var fields = jQuery('.qty-input');
 
-updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+function enableButtons(buttons) {
+    buttons.removeClass('disabled').prop('disabled', false);
+}
 
-for(var i=0;i<fields.length;i++){
-    fields[i].observe('change', checkButtonsRelation)
-    fields[i].baseValue = fields[i].value;
+function disableButtons(buttons) {
+    buttons.addClass('disabled').prop('disabled', true);
 }
 
+disableButtons(updateButtons);
+
+fields.on('change', checkButtonsRelation);
+fields.each(function (i, elem) {
+    elem.baseValue = elem.value;
+});
+
 function checkButtonsRelation() {
     var hasChanges = false;
-    fields.each(function (elem) {
+    fields.each(function (i, elem) {
         if (elem.baseValue != elem.value) {
             hasChanges = true;
         }
     }.bind(this));
     if (hasChanges) {
-        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+        disableButtons(submitButtons);
+        enableButtons(updateButtons);
     }
     else {
-        submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+        enableButtons(submitButtons);
+        disableButtons(updateButtons);
     }
 }
 
 submitCreditMemo = function() {
-    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=0;
+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
+    if (creditMemoOffline.length) {
+        creditMemoOffline.prop('value', 0);
+    }
     // Temporary solution will be replaced after refactoring order functionality
     jQuery('#edit_form').triggerHandler('save');
-}
+};
 
 submitCreditMemoOffline = function() {
-    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=1;
+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
+    if (creditMemoOffline.length) {
+        creditMemoOffline.prop('value', 1);
+    }
     // Temporary solution will be replaced after refactoring order functionality
     jQuery('#edit_form').triggerHandler('save');
-}
-
-var sendEmailCheckbox = $('send_email');
+};
 
-if (sendEmailCheckbox) {
-    var notifyCustomerCheckbox = $('notify_customer');
-    var creditmemoCommentText = $('creditmemo_comment_text');
-    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
+var sendEmailCheckbox = jQuery('#send_email');
+if (sendEmailCheckbox.length) {
+    var notifyCustomerCheckbox = jQuery('#notify_customer');
+    sendEmailCheckbox.on('change', bindSendEmail);
     bindSendEmail();
 }
 
-function bindSendEmail()
-{
-    if (sendEmailCheckbox.checked == true) {
-        notifyCustomerCheckbox.disabled = false;
-        //creditmemoCommentText.disabled = false;
+function bindSendEmail() {
+    if (sendEmailCheckbox.prop('checked') == true) {
+        notifyCustomerCheckbox.prop('disabled', false);
     }
     else {
-        notifyCustomerCheckbox.disabled = true;
-        //creditmemoCommentText.disabled = true;
+        notifyCustomerCheckbox.prop('disabled', true);
     }
 }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 4a77c3b166de9..872be35cff206 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -134,56 +134,61 @@
 </section>
 
 <script>
-require(['jquery', 'prototype'], function(jQuery){
+require(['jquery'], function(jQuery){
 
 //<![CDATA[
-var submitButtons = $$('.submit-button');
-var updateButtons = $$('.update-button');
+var submitButtons = jQuery('.submit-button');
+var updateButtons = jQuery('.update-button');
 var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
-var fields = $$('.qty-input');
+var fields = jQuery('.qty-input');
 
-updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+function enableButtons(buttons) {
+    buttons.removeClass('disabled').prop('disabled', false);
+}
 
-for(var i=0;i<fields.length;i++){
-    jQuery(fields[i]).on('keyup', checkButtonsRelation);
-    fields[i].baseValue = fields[i].value;
+function disableButtons(buttons) {
+    buttons.addClass('disabled').prop('disabled', true);
 }
 
+disableButtons(updateButtons);
+
+fields.on('keyup', checkButtonsRelation);
+fields.each(function (i, elem) {
+    elem.baseValue = elem.value;
+});
+
 function checkButtonsRelation() {
     var hasChanges = false;
-    fields.each(function (elem) {
+    fields.each(function (i, elem) {
         if (elem.baseValue != elem.value) {
             hasChanges = true;
         }
     }.bind(this));
     if (hasChanges) {
-        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+        disableButtons(submitButtons);
+        enableButtons(updateButtons);
     }
     else {
         if (enableSubmitButtons) {
-            submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+            enableButtons(submitButtons);
         }
-        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+        disableButtons(updateButtons);
     }
 }
 
-var sendEmailCheckbox = $('send_email');
-if (sendEmailCheckbox) {
-    var notifyCustomerCheckbox = $('notify_customer');
-    var invoiceCommentText = $('invoice_comment_text');
-    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
+var sendEmailCheckbox = jQuery('#send_email');
+if (sendEmailCheckbox.length) {
+    var notifyCustomerCheckbox = jQuery('#notify_customer');
+    sendEmailCheckbox.on('change', bindSendEmail);
     bindSendEmail();
 }
 function bindSendEmail()
 {
-    if (sendEmailCheckbox.checked == true) {
-        notifyCustomerCheckbox.disabled = false;
-        //invoiceCommentText.disabled = false;
+    if (sendEmailCheckbox.prop('checked') == true) {
+        notifyCustomerCheckbox.prop('disabled', false);
     }
     else {
-        notifyCustomerCheckbox.disabled = true;
-        //invoiceCommentText.disabled = true;
+        notifyCustomerCheckbox.prop('disabled', true);
     }
 }
 

From 730c576c88ee8da80f277d469a3b4f0d0451aba4 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 15 Mar 2019 15:05:43 +0200
Subject: [PATCH 2/6] MC-15406: [FT] [MFTF]
 StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because
 of bad design

---
 ...ctCustomOptionsDifferentStoreViewsTest.xml | 89 ++++++++++---------
 .../Mftf/ActionGroup/CheckoutActionGroup.xml  |  2 +-
 .../AdminCreateStoreViewActionGroup.xml       |  4 +-
 .../AdminSwitchStoreViewActionGroup.xml       |  1 +
 4 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index df4803bcd7906..91b6766169b91 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -52,10 +52,6 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
 
-            <!-- Reset Product filter -->
-
-            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
-
             <!-- Delete Store View EN -->
 
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
@@ -67,6 +63,12 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearWebsitesGridFilters"/>
+
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
+
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
         </after>
 
         <!-- Open Product Grid, Filter product and open -->
@@ -78,8 +80,9 @@
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
 
-        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductPage">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
 
         <!-- Update Product with Option Value DropDown 1-->
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses2"/>
@@ -101,15 +104,12 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
 
         <!-- Switcher to Store FR-->
-        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-
-        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
-        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
+            <argument name="storeView" value="customStoreFR.name"/>
+        </actionGroup>
 
         <!-- Open tab Customizable Options -->
 
-        <waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
 
         <!-- Update Option Customizable Options and Option Value 1-->
@@ -129,11 +129,9 @@
 
         <!-- Login Customer Storefront -->
 
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField  userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
 
         <!-- Go to Product Page -->
 
@@ -176,24 +174,29 @@
 
         <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
         <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
 
         <!-- Place Order -->
 
-        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <!-- Place Order -->
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
 
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
 
         <!-- Open Order -->
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
-        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
-        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
+        <actionGroup ref="filterOrderGridById" stepKey="openOrdersGrid">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
 
@@ -205,14 +208,12 @@
         <!-- Switch to FR Store View Storefront -->
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
-        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
-        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
-        <waitForPageLoad stepKey="waitForPageLoad12"/>
 
-        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStore">
+            <argument name="storeView" value="customStoreFR"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
@@ -250,13 +251,22 @@
 
         <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
         <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
 
         <!-- Place Order -->
 
-        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod2"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton2"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext2"/>
+
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod2"/>
+        <!-- Place Order -->
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder2">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
 
         <!-- Open Product Grid, Filter product and open -->
 
@@ -296,8 +306,7 @@
 
         <!--Go to Product Page-->
 
-        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page2"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index b67b7451d5968..7ddecf94a2e39 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -263,7 +263,7 @@
             <argument name="orderNumberMessage"/>
             <argument name="emailYouMessage"/>
         </arguments>
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 9b942109785d4..45b44b2d82f38 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -25,8 +25,8 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
-        <waitForPageLoad stepKey="waitForStorePageLoad" />
-        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReolad"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
     </actionGroup>
     <!--Save the Store view-->
     <actionGroup name="AdminCreateStoreViewActionSaveGroup">
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
index ac8e9d717fdca..47236376f0209 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -18,6 +18,7 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
         <waitForPageLoad stepKey="waitForStoreViewSwitched"/>
+        <scrollToTopOfPage stepKey="scrollToStoreSwitcher"/>
         <see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
     </actionGroup>
     <actionGroup name="AdminSwitchToAllStoreViewActionGroup" extends="AdminSwitchStoreViewActionGroup">

From a5daaec8b264b6c648424441d3e452065399e6f3 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 18 Mar 2019 12:20:09 +0200
Subject: [PATCH 3/6] MC-15406: [FT] [MFTF]
 StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because
 of bad design

---
 .../AdminCreateStoreViewActionGroup.xml       | 16 ++++-----
 .../Mftf/Section/AdminStoresGridSection.xml   |  1 +
 .../Mftf/Test/AdminCreateStoreViewTest.xml    | 34 +++++++++++--------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 45b44b2d82f38..c02b3fc0fb72c 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -8,6 +8,7 @@
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+
     <actionGroup name="AdminCreateStoreViewActionGroup">
         <arguments>
             <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
@@ -28,17 +29,12 @@
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReolad"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
     </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 name="AdminCreateStoreViewWithoutCheckActionGroup" extends="AdminCreateStoreViewActionGroup">
+        <remove keyForRemoval="waitForPageReolad"/>
+        <remove keyForRemoval="seeSavedMessage"/>
     </actionGroup>
+
     <actionGroup name="navigateToAdminContentManagementPage">
         <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index 592af42f2de30..898c8b8841203 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -23,5 +23,6 @@
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
+        <element name="gridCell" type="text" selector="//table[@class='data-grid']//tr[{{row}}]//td[count(//table[@class='data-grid']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
      </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
index af8aceed07f0f..e20eb70ae6f45 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -11,32 +11,36 @@
             <annotations>
                 <features value="Store"/>
                 <stories value="Create a store view in admin"/>
-                <title value="Admin should be able to create a store view"/>
-                <description value="Admin should be able to create a store view"/>
+                <title value="Admin shouldn't be able to create a Store View with the same code"/>
+                <description value="Admin shouldn't be able to create a Store View with the same code"/>
                 <group value="storeView"/>
                 <severity value="AVERAGE"/>
-                <testCaseId value="MAGETWO-95111"/>
+                <useCaseId value="MAGETWO-95111"/>
+                <testCaseId value="MC-15422"/>
             </annotations>
+
             <before>
-                <actionGroup ref="LoginActionGroup" stepKey="login"/>
+                <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
                 <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
-                <!--<createData stepKey="b2" entity="customStoreGroup"/>-->
             </before>
-            <!--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="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
                     <argument name="customStore" value="customStore"/>
                 </actionGroup>
+                <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
                 <actionGroup ref="logout" stepKey="logout"/>
             </after>
+
+            <!--Filter grid and see created store view-->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
+            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+            <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
+            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
+            <see selector="{{AdminStoresGridSection.gridCell('1', 'Store View')}}" userInput="{{customStore.name}}" stepKey="seeNewStoreView"/>
+            <!--Try to create store view with the same code-->
+            <actionGroup ref="AdminCreateStoreViewWithoutCheckActionGroup" stepKey="createSameStoreView"/>
+            <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSuccessMessage"/>
+            <see selector="{{AdminMessagesSection.error}}" userInput="Store with the same code already exists." stepKey="seeErrorMessage"/>
         </test>
 </tests>

From 450c97302ccfe64f8967f9d492f1230fc9dde7ca Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Mar 2019 14:35:49 +0200
Subject: [PATCH 4/6] MC-15406: [FT] [MFTF]
 StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because
 of bad design

---
 ...frontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml | 2 ++
 .../Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 91b6766169b91..fb95fc3f57bca 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -69,6 +69,8 @@
 
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
         </after>
 
         <!-- Open Product Grid, Filter product and open -->
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index c02b3fc0fb72c..15fc413c7ec92 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -26,7 +26,7 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
-        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReolad"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReload"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
     </actionGroup>
 

From 1688e1e9edadcfe189bffd272283e569bfe81d29 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 25 Mar 2019 10:57:14 +0200
Subject: [PATCH 5/6] MC-15406: [FT] [MFTF]
 StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because
 of bad design

---
 .../Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 15fc413c7ec92..b0c00f56b6d3b 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -31,7 +31,7 @@
     </actionGroup>
 
     <actionGroup name="AdminCreateStoreViewWithoutCheckActionGroup" extends="AdminCreateStoreViewActionGroup">
-        <remove keyForRemoval="waitForPageReolad"/>
+        <remove keyForRemoval="waitForPageReload"/>
         <remove keyForRemoval="seeSavedMessage"/>
     </actionGroup>
 

From 63c5db6ffeddefe8368e5ad7a2ba73b4dcba1afb Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 22 Apr 2019 16:02:53 +0300
Subject: [PATCH 6/6] MC-15406: [FT] [MFTF]
 StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest fails because
 of bad design

---
 .../Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index f1e15aa5750dc..fda92810a13be 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -35,6 +35,13 @@
         <remove keyForRemoval="seeSavedMessage"/>
     </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>
+
     <actionGroup name="navigateToAdminContentManagementPage">
         <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
@@ -58,4 +65,4 @@
         <waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
         <see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>