Merge remote-tracking branch 'origin/MAGETWO-66894' into PR-bugfixes-040417

Author: iivashchenko

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml

@@ -241,13 +241,12 @@
         <dataset name="DE_address">
             <field name="firstname" xsi:type="string">Jan</field>
             <field name="lastname" xsi:type="string">Jansen</field>
-            <field name="email" xsi:type="string">JaneDoe_%isolation%@example.com</field>
             <field name="company" xsi:type="string">Magento %isolation%</field>
             <field name="city" xsi:type="string">Berlin</field>
             <field name="street" xsi:type="string">Augsburger Strabe 41</field>
             <field name="postcode" xsi:type="string">10789</field>
             <field name="country_id" xsi:type="string">Germany</field>
-            <field name="region" xsi:type="string">Berlin</field>
+            <field name="region_id" xsi:type="string">Berlin</field>
             <field name="telephone" xsi:type="string">333-33-333-33</field>
         </dataset>
 

dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/CityBasedShippingRateTest.xml

@@ -38,7 +38,7 @@
                 <item name="4" xsi:type="boolean">true</item>
                 <item name="5" xsi:type="boolean">true</item>
             </data>
-            <data name="configData" xsi:type="string">dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
+            <data name="configData" xsi:type="string">dhl_eu, shipping_origin_GB, config_base_currency_gb</data>
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml

@@ -19,7 +19,7 @@
             <data name="shipping/shipping_method" xsi:type="string">Express easy</data>
             <data name="cart/data/shipping_method" xsi:type="string">Express easy</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
-            <data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
+            <data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_GB, config_base_currency_gb</data>
             <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />

dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml

@@ -111,5 +111,32 @@
                 <item name="value" xsi:type="string">Weinbergstrasse 4</item>
             </field>
         </dataset>
+
+        <dataset name="shipping_origin_GB">
+            <field name="shipping/origin/country_id" xsi:type="array">
+                <item name="scope" xsi:type="string">carriers</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">United Kingdom</item>
+                <item name="value" xsi:type="string">GB</item>
+            </field>
+            <field name="shipping/origin/postcode" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">SW1W 8JA</item>
+            </field>
+            <field name="shipping/origin/city" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">London</item>
+            </field>
+            <field name="shipping/origin/street_line1" xsi:type="array">
+                <item name="scope" xsi:type="string">shipping</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">Bourne St</item>
+            </field>
+        </dataset>
     </repository>
 </config>