Merge branch 'main' into MAIN-B-21675-final

transcom · Jan 8, 2025 · 72178bd · 72178bd
2 parents acf9fe3 + cc56ac9
commit 72178bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1059,6 +1059,7 @@
 20241218201833_add_PPPO_BASE_ELIZABETH.up.sql
 20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql
 20241227153723_remove_empty_string_emplid_values.up.sql
+20241227202424_insert_transportation_offices_camp_pendelton.up.sql
 20241230190638_remove_AK_zips_from_zip3.up.sql
 20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
 20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql
diff --git a/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql b/migrations/app/schema/20241227202424_insert_transportation_offices_camp_pendelton.up.sql
@@ -0,0 +1,8 @@
+--update address for Camp Pendelton transportation office
+update addresses set postal_code = '92054', us_post_region_cities_id = 'd0c818dc-1e6c-416a-bfa9-2762efebaed1' where id = 'af2ebb73-54fe-46e0-9525-a4568ceb9e0e';
+
+--fix Camp Pendelton transportation office spelling
+update transportation_offices set name = 'PPPO DMO Camp Pendleton' where id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab';
+
+--associate duty location to Camp Pendleton transportation office
+update duty_locations set transportation_office_id = 'f50eb7f5-960a-46e8-aa64-6025b44132ab' where id = '6e320acb-47b6-45e0-80f4-9d8dc1e20812';
diff --git a/playwright/tests/my/mymove/orders.spec.js b/playwright/tests/my/mymove/orders.spec.js
@@ -107,10 +107,8 @@ test.describe('(MultiMove) Orders', () => {
     await expect(page.getByLabel('Current duty location')).toBeEmpty();
     await customerPage.selectDutyLocation('Marine Corps AS Yuma, AZ 85369', 'origin_duty_location');
 
+    await page.getByRole('combobox', { name: 'Counseling Office' }).selectOption({ label: 'PPPO DMO Camp Pendleton' });
     await page.getByRole('combobox', { name: 'Pay grade' }).selectOption({ label: 'E-7' });
-    await page
-      .getByRole('combobox', { name: 'Counseling Office' })
-      .selectOption({ label: 'PPPO DMO Camp Pendleton - USMC' });
 
     await customerPage.navigateForward();
     await customerPage.waitForPage.ordersUpload();