Merge remote-tracking branch 'origin/test' into dev
# Conflicts: # firstleg/src/main/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceService.java # firstleg/src/test/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceServiceTest.java # scripts/admin-test-env-modules/ocean-bookings.mjs # scripts/admin-test-env-modules/phase3-container-customs-fixture.mjs # scripts/admin-test-env-modules/phase3-container-documents-contract.test.mjs # scripts/admin-test-env-modules/phase3-container-loading.mjs # scripts/admin-test-env-modules/phase3-customs.mjs # scripts/admin-test-env-modules/phase3-loading-finalize.mjs # scripts/admin-test-env-modules/phase3-loading.mjs # scripts/admin-test-env-modules/phase3-port-schedules.mjs # scripts/admin-test-env-modules/service-center-flow.mjs
This commit is contained in:
@@ -64,7 +64,7 @@ function warehousePayload(marker, edited = false) {
|
||||
countryCode: 'US',
|
||||
timezone: 'UTC-8',
|
||||
contactName: 'Phase4 QA',
|
||||
contactPhone: '+1-213-555-0199',
|
||||
contactPhone: '12135550199',
|
||||
contactEmail: null,
|
||||
status: 'ACTIVE',
|
||||
remark: edited ? `${marker} lifecycle edited` : `${marker} lifecycle`,
|
||||
@@ -302,7 +302,7 @@ function vehiclePayload(context, edited = false) {
|
||||
model: edited ? 'Phase4 QA Truck Edited' : 'Phase4 QA Truck',
|
||||
fuelConsumptionPer100Km: edited ? 18.75 : 18.5,
|
||||
mileageKm: edited ? 101 : 100,
|
||||
driverOrDispatchCompany: `${context.marker} Carrier`, phone: '+1-213-555-0188',
|
||||
driverOrDispatchCompany: `${context.marker} Carrier`, phone: '12135550188',
|
||||
region: 'OVERSEAS', ownership: 'OWNED',
|
||||
...(edited ? {} : { status: 'IN_SERVICE' }),
|
||||
remark: edited ? `${context.marker} lifecycle edited` : `${context.marker} lifecycle`,
|
||||
|
||||
Reference in New Issue
Block a user