Merge branch 'MAGETWO-90539' into MAGETWO-90531-WYSIWYG-special-char-Toolbar-Configuration

Author: Joan He

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml

@@ -102,7 +102,7 @@
         </arguments>
         <conditionalClick stepKey="openShippingDetails" selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false"/>
         <selectOption stepKey="selectCountry" selector="{{CheckoutCartSummarySection.country}}" userInput="{{taxCode.country}}"/>
-        <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.country}}" userInput="{{taxCode.country}}"/>
+        <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{taxCode.state}}"/>
         <fillField stepKey="fillZip" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{taxCode.zip}}"/>
         <waitForPageLoad stepKey="waitForFormUpdate"/>
     </actionGroup>

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -17,17 +17,23 @@ define([
      */
     return function (addressData) {
         var identifier = Date.now(),
+            countryId = addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
             regionId;
 
         if (addressData.region && addressData.region['region_id']) {
             regionId = addressData.region['region_id'];
-        } else if (addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId) { //eslint-disable-line
+        } else if (
+            /* eslint-disable */
+            addressData['country_id'] && addressData['country_id'] == window.checkoutConfig.defaultCountryId ||
+            !addressData['country_id'] && countryId == window.checkoutConfig.defaultCountryId
+            /* eslint-enable */
+        ) {
             regionId = window.checkoutConfig.defaultRegionId || undefined;
         }
 
         return {
             email: addressData.email,
-            countryId: addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
+            countryId: countryId,
             regionId: regionId || addressData.regionId,
             regionCode: addressData.region ? addressData.region['region_code'] : null,
             region: addressData.region ? addressData.region.region : null,

app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml

@@ -248,9 +248,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-297"/>
             <group value="Tax"/>
-            <skip>
-                <issueId value="MAGETWO-90539"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -357,9 +354,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-298"/>
             <group value="Tax"/>
-            <skip>
-                <issueId value="MAGETWO-90539"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>