Merge pull request #42 from netresearch/CI-241

Fix building addresses with province

Author: schmengler

src/Customer/AddressBuilder.php

@@ -44,7 +44,14 @@ public static function anAddress(
 
         $faker = FakerFactory::create($locale);
         $countryCode = substr($locale, -2);
-        $regionId = $objectManager->create(Region::class)->loadByName($faker->state, $countryCode)->getId();
+
+        try {
+            $region = $faker->province;
+        } catch (\InvalidArgumentException $exception) {
+            $region = $faker->state;
+        }
+
+        $regionId = $objectManager->create(Region::class)->loadByName($region, $countryCode)->getId();
 
         /** @var AddressInterface $address */
         $address = $objectManager->create(AddressInterface::class);

tests/Sales/OrderBuilderTest.php

@@ -235,4 +235,50 @@ public function createMultipleOrders()
         $customerIds[$orderWithCustomerFixture->getCustomerId()] = 1;
         self::assertCount(3, $customerIds);
     }
+
+    /**
+     * Create orders for faker addresses with either state or province. Assert both types have a `region_id` assigned.
+     *
+     * @test
+     * @throws \Exception
+     */
+    public function createIntlOrders()
+    {
+        $atLocale = 'de_AT';
+        $atOrder = OrderBuilder::anOrder()
+            ->withCustomer(
+                CustomerBuilder::aCustomer()->withAddresses(
+                    AddressBuilder::anAddress(null, $atLocale)->asDefaultBilling()->asDefaultShipping()
+                )
+            )
+            ->build();
+        $this->orderFixtures[] = new OrderFixture($atOrder);
+
+        $usLocale = 'en_US';
+        $usOrder = OrderBuilder::anOrder()
+            ->withCustomer(
+                CustomerBuilder::aCustomer()->withAddresses(
+                    AddressBuilder::anAddress(null, $usLocale)->asDefaultBilling()->asDefaultShipping()
+                )
+            )
+            ->build();
+        $this->orderFixtures[] = new OrderFixture($usOrder);
+
+        $caLocale = 'en_CA';
+        $caOrder = OrderBuilder::anOrder()
+            ->withCustomer(
+                CustomerBuilder::aCustomer()->withAddresses(
+                    AddressBuilder::anAddress(null, $caLocale)->asDefaultBilling()->asDefaultShipping()
+                )
+            )
+            ->build();
+        $this->orderFixtures[] = new OrderFixture($caOrder);
+
+        self::assertSame(substr($atLocale, 3, 4), $atOrder->getBillingAddress()->getCountryId());
+        self::assertNotEmpty($atOrder->getBillingAddress()->getRegionId());
+        self::assertSame(substr($usLocale, 3, 4), $usOrder->getBillingAddress()->getCountryId());
+        self::assertNotEmpty($usOrder->getBillingAddress()->getRegionId());
+        self::assertSame(substr($caLocale, 3, 4), $caOrder->getBillingAddress()->getCountryId());
+        self::assertNotEmpty($caOrder->getBillingAddress()->getRegionId());
+    }
 }