diff -u b/modules/ubercart/migration_templates/d6_ubercart_billing_profile.yml b/modules/ubercart/migration_templates/d6_ubercart_billing_profile.yml --- b/modules/ubercart/migration_templates/d6_ubercart_billing_profile.yml +++ b/modules/ubercart/migration_templates/d6_ubercart_billing_profile.yml @@ -23,7 +23,7 @@ 'address/family_name': billing_last_name 'address/organization': billing_company 'address/address_line1': billing_street1 - 'address/address_line1': billing_street2 + 'address/address_line2': billing_street2 'address/locality': billing_city 'address/administrative_area': billing_zone 'address/postal_code': billing_postal_code diff -u b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php --- b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php +++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php @@ -47,14 +47,14 @@ $this->assertBillingProfile(1, TRUE, '1492868907', '1493078815'); $profile = Profile::load(1); $address = $profile->get('address')->first()->getValue(); - $this->assertAddressField($address, 'US', '', '', NULL, '', NULL, '', NULL, '', NULL, '', ''); + $this->assertAddressField($address, 'US', '', '', NULL, '', NULL, '', '', '', NULL, '', ''); $phone = $profile->get('phone')->getValue(); $this->assertSame([], $phone); $this->assertBillingProfile(2, TRUE, '1492989920', '1493081092'); $profile = Profile::load(2); $address = $profile->get('address')->first()->getValue(); - $this->assertAddressField($address, 'US', 'US-WY', 'World B', NULL, '7654', NULL, '42 View lane', NULL, 'Trin', NULL, 'Tragula', 'Perspective Ltd.'); + $this->assertAddressField($address, 'US', 'US-WY', 'World B', NULL, '7654', NULL, '42 View Lane', 'Frogstar', 'Trin', NULL, 'Tragula', 'Perspective Ltd.'); $phone = $profile->get('phone')->getValue()[0]['value']; $this->assertSame('111-9876', $phone); } only in patch2: unchanged: --- a/tests/fixtures/uc6.php +++ b/tests/fixtures/uc6.php @@ -22056,7 +22056,7 @@ $connection->insert('uc_orders') 'delivery_last_name' => 'Tragula', 'delivery_phone' => '111-9876', 'delivery_company' => 'Perspective Ltd.', - 'delivery_street1' => '42 View lane', + 'delivery_street1' => '42 View Lane', 'delivery_street2' => 'Frogstar', 'delivery_city' => 'World B', 'delivery_zone' => '65', @@ -22066,7 +22066,7 @@ $connection->insert('uc_orders') 'billing_last_name' => 'Tragula', 'billing_phone' => '111-9876', 'billing_company' => 'Perspective Ltd.', - 'billing_street1' => '42 View lane', + 'billing_street1' => '42 View Lane', 'billing_street2' => 'Frogstar', 'billing_city' => 'World B', 'billing_zone' => '65',