Merge remote-tracking branch 'trigger/MAGETWO-95798' into BugFixPR

Author: Joan He

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml

@@ -33,5 +33,6 @@
         <element name="defaultShipping" type="button" selector=".billing-address-details"/>
         <element name="state" type="button" selector="//*[text()='Alabama']"/>
         <element name="stateInput" type="input" selector="input[name=region]"/>
+        <element name="regionOptions" type="select" selector="select[name=region_id] option"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -32,6 +32,7 @@
         <data key="vat_id">vatData</data>
         <data key="default_shipping">true</data>
         <data key="default_billing">true</data>
+        <data key="region_qty">66</data>
     </entity>
     <entity name="US_Address_TX" type="address">
         <data key="firstname">John</data>

app/code/Magento/Ui/view/base/web/js/form/element/region.js

@@ -78,13 +78,12 @@ define([
          * @param {String} field
          */
         filter: function (value, field) {
-            var country = registry.get(this.parentName + '.' + 'country_id'),
-                option;
+            var superFn = this._super;
 
-            if (country) {
-                option = country.indexedOptions[value];
+            registry.get(this.parentName + '.' + 'country_id', function (country) {
+                var option = country.indexedOptions[value];
 
-                this._super(value, field);
+                superFn.call(this, value, field);
 
                 if (option && option['is_region_visible'] === false) {
                     // hide select and corresponding text input field if region must not be shown for selected country
@@ -94,7 +93,7 @@ define([
                         this.toggleInput(false);
                     }
                 }
-            }
+            }.bind(this));
         }
     });
 });