Merge remote-tracking branch 'origin/MAGETWO-65696' into BUGS

Author: Sergii Kovalenko

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

@@ -251,6 +251,21 @@
             <field name="telephone" xsi:type="string">333-33-333-33</field>
         </dataset>
 
+        <dataset name="DE_address_default">
+            <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="telephone" xsi:type="string">333-33-333-33</field>
+            <field name="default_billing" xsi:type="string">Yes</field>
+            <field name="default_shipping" xsi:type="string">Yes</field>
+        </dataset>
+
         <dataset name="DE_address_Frankfurt">
             <field name="firstname" xsi:type="string">Jan</field>
             <field name="lastname" xsi:type="string">Jansen</field>

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

@@ -228,6 +228,20 @@
             </field>
         </dataset>
 
+        <dataset name="customer_DE_default_billing_address">
+            <field name="firstname" xsi:type="string">John</field>
+            <field name="lastname" xsi:type="string">Doe%isolation%</field>
+            <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
+            <field name="password" xsi:type="string">123123^q</field>
+            <field name="password_confirmation" xsi:type="string">123123^q</field>
+            <field name="address" xsi:type="array">
+                <item name="dataset" xsi:type="string">DE_address_default</item>
+            </field>
+            <field name="website_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default</item>
+            </field>
+        </dataset>
+
         <dataset name="customer_UK_address_with_VAT">
             <field name="firstname" xsi:type="string">John</field>
             <field name="lastname" xsi:type="string">Doe%isolation%</field>

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ApplyVatIdTest.xml

@@ -27,5 +27,15 @@
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerAddressSuccessSaveMessage" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
         </variation>
+        <variation name="ApplyVatIdTestVariation3" summary="Enable Automatic Assignment of Customers to Appropriate VAT Group (valid Domestic group)" ticketId="MAGETWO-12447">
+            <data name="vatConfig/dataset" xsi:type="string">enable_VAT_on_frontend</data>
+            <data name="configData" xsi:type="string">store_information_DE_with_VAT, enable_VAT_on_frontend</data>
+            <data name="customer/dataset" xsi:type="string">customer_DE_default_billing_address</data>
+            <data name="vatId/data/vat_id" xsi:type="string">111607872</data>
+            <data name="customerGroup" xsi:type="string">valid_domestic_group</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerAddressSuccessSaveMessage" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerForm" />
+        </variation>
     </testCase>
 </config>