MAGETWO-61725: [GITHUB] Improve address save flow to allow to use custom validators #7552]

Author: Aleksandr Osadchyi

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressRepositoryTest.php

@@ -128,6 +128,7 @@ protected function setUp()
                 'setCustomer',
                 'getCountryModel',
                 'getShouldIgnoreValidation',
+                'validate',
                 'save',
                 'getDataModel',
                 'getCustomerId',
@@ -191,6 +192,9 @@ public function testSave()
         $this->address->expects($this->once())
             ->method('setCustomer')
             ->with($this->customer);
+        $this->address->expects($this->once())
+            ->method('validate')
+            ->willReturn(true);
         $this->address->expects($this->once())
             ->method('save');
         $this->addressRegistry->expects($this->once())
@@ -208,12 +212,6 @@ public function testSave()
         $this->address->expects($this->once())
             ->method('getDataModel')
             ->willReturn($customerAddress);
-        $this->address->expects($this->once())
-            ->method('getShouldIgnoreValidation')
-            ->willReturn(true);
-        $this->address->expects($this->once())
-        ->method('validate')
-        ->willReturn(true);
 
         $this->repository->save($customerAddress);
     }