Merge remote-tracking branch 'origin/MAGETWO-66276' into pr-218

Author: Sergey Shvets

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

@@ -17,7 +17,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</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,31 @@
                 <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>