From 9b3fe43f891d174ed00b7dd31306d3ef71a6c7dd Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 12 Nov 2018 14:00:10 -0600
Subject: [PATCH 1/4] MC-5595:
 Magento\FunctionalTestingFramework.functional.StorefrontTaxQuoteCartLoggedInSimple
 fails randomly

unskip mftf test
---
 .../Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 0b2809dfc3543..0326a4cadb537 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-295"/>
             <group value="Tax"/>
-            <skip>
-                <issueId value="MAGETWO-96194"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

From b47df3b1f3df6ae2cb53c5f1d1b18b090386d642 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 14 Nov 2018 11:31:10 -0600
Subject: [PATCH 2/4] MC-5595:
 Magento\FunctionalTestingFramework.functional.StorefrontTaxQuoteCartLoggedInSimple
 fails randomly

- add wait for correct shipping amount
---
 .../Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 0326a4cadb537..a41f00c547a9a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -94,6 +94,7 @@
         <waitForPageLoad stepKey="waitForCart"/>
 
         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <waitForElementVisible stepKey="waitForCorrectShippingAmount" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}[text()='$5.00']"/>
         <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
         <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
         <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>

From 31adbdbfa226f96fb1e98353645a206cc8e15c43 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 14 Nov 2018 15:00:47 -0600
Subject: [PATCH 3/4] MC-5538: Search terms are not cached in case of form_key
 present in the request

---
 .../Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml     | 1 +
 lib/web/mage/common.js                                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 7ca86b8b14a4d..387a7547f4daf 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -15,6 +15,7 @@
         </arguments>
         <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
     </actionGroup>
diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
index 4742c77ea8627..01f696ec1b7fc 100644
--- a/lib/web/mage/common.js
+++ b/lib/web/mage/common.js
@@ -21,7 +21,7 @@ define([
                 form = $(e.target),
                 formKey = $('input[name="form_key"]').val();
 
-            if (formKey && !form.find('input[name="form_key"]').length) {
+            if (formKey && !form.find('input[name="form_key"]').length && form[0].method !== 'get') {
                 formKeyElement = document.createElement('input');
                 formKeyElement.setAttribute('type', 'hidden');
                 formKeyElement.setAttribute('name', 'form_key');

From cbacef5774ccf7fd1aa27b722abf0b8be508aa75 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 16 Nov 2018 14:20:23 -0600
Subject: [PATCH 4/4] MC-5595:
 Magento\FunctionalTestingFramework.functional.StorefrontTaxQuoteCartLoggedInSimple
 fails randomly

- change waitForElementVisible to waitForText
---
 .../Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index af6545c6c4b58..73e018ec83161 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -95,7 +95,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
 
         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <waitForElementVisible stepKey="waitForCorrectShippingAmount" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}[text()='$5.00']"/>
+        <waitForText userInput="$5.00" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" time="30" stepKey="waitForCorrectShippingAmount"/>
         <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
         <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
         <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>