Merge pull request #3474 from magento-borg/BugFixPR

[2.3-develop] Bug Fixes
magento · Nov 26, 2018 · 7d6b0d7 · 7d6b0d7
2 parents 7755eef + 62efbf6
commit 7d6b0d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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/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"/>
@@ -98,6 +95,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
 
         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <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}}%)"/>

diff --git 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');