Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nts loa and SIT flaky fix int #13613

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Nts loa and SIT flaky fix int #13613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c02dd5
fix flaky formatting
cameroncaci Sep 3, 2024
4367941
fix date calculation flaky tests
cameroncaci Sep 3, 2024
ef5ea63
Revert "fix date calculation flaky tests"
cameroncaci Sep 3, 2024
8ae68e8
fixed flaky tests in int
cameroncaci Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions playwright/tests/office/servicescounseling/servicesCounselingNTS.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ test.describe('Services counselor user', () => {
// Fill out the HHG and NTS accounting codes
await page.getByTestId('hhgTacInput').fill(tac.tac);
const today = new Date();
const formattedDate = new Intl.DateTimeFormat('en-GB', {
day: '2-digit',
month: 'short',
year: 'numeric',
}).format(today);
const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(today);
const month = new Intl.DateTimeFormat('en', { month: 'short' }).format(today);
const year = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(today);
const formattedDate = `${day} ${month} ${year}`;

await page.locator('input[name="issueDate"]').fill(formattedDate);

await page.getByTestId('hhgSacInput').fill('4K988AS098F');
Expand Down
67 changes: 38 additions & 29 deletions playwright/tests/office/txo/sitUpdates.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ test.describe('TOO user', () => {
/** @type {TooFlowPage} */
let tooFlowPage;

// Helper func to calculate days between 2 given dates
// This is to support months of 30 and 31 dayss
const calculateDaysDiff = (startDate, endDate) => {
let days = 0;
const currentDate = new Date(startDate);

while (currentDate < endDate) {
days += 1;
currentDate.setDate(currentDate.getDate() + 1);
}

return days;
};

test.describe('previewing shipment with current SIT with past SIT', () => {
test.beforeEach(async ({ officePage }) => {
// build move in SIT with 90 days authorized and without pending extension requests
Expand All @@ -32,14 +46,11 @@ test.describe('TOO user', () => {
// get 2 months ago
const twoMonthsAgo = new Date(today);
twoMonthsAgo.setMonth(today.getMonth() - 2);
// get the time diff
const timeDiff = oneMonthAgo.getTime() - twoMonthsAgo.getTime();
// get the days, converting milliseconds to days
const daysDiff = timeDiff / (1000 * 60 * 60 * 24);
// be inclusive of the last day
const totalDaysBetweenOneMonthInclusive = daysDiff + 1;
// get days between
const daysBetweenTwoMonthsAgoAndOneMonthAgo = calculateDaysDiff(twoMonthsAgo, oneMonthAgo);
const daysBetweenOneMonthAgoAndToday = calculateDaysDiff(oneMonthAgo, today);
// get sums
const totalDaysUsed = totalDaysBetweenOneMonthInclusive * 2; // Origin and Dest sit each used 1 month
const totalDaysUsed = daysBetweenTwoMonthsAgoAndOneMonthAgo + daysBetweenOneMonthAgoAndToday;
const remainingDays = 90 - totalDaysUsed;
// assert that days used is the following sum
// - past origin SIT (entry 2 months ago, departure 1 month ago)
Expand All @@ -53,19 +64,23 @@ test.describe('TOO user', () => {
).toBeVisible();
// assert that total days in destination sit is 1 month, inclusive of last day
await expect(
page
.getByTestId('sitStartAndEndTable')
.getByText(`${totalDaysBetweenOneMonthInclusive}`, { exact: true })
.first(),
page.getByTestId('sitStartAndEndTable').getByText(`${daysBetweenOneMonthAgoAndToday}`, { exact: true }).first(),
).toBeVisible();

// get authorized end date as 90 days from the origin start date (two months ago)
const ninetyDaysFromStartDateInclusive = new Date(twoMonthsAgo);
ninetyDaysFromStartDateInclusive.setDate(ninetyDaysFromStartDateInclusive.getDate() + 89); // Use 89 because the last day is counted as a whole day
// Get the SIT start date from the UI
const sitStartDateText = await page.getByTestId('sitStartAndEndTable').locator('td').nth(0).innerText();
const sitStartDate = new Date(sitStartDateText);

// Calculate the authorized end date by adding 90 days to the start date and then subtracting total days used
const authorizedEndDate = new Date(sitStartDate);
// Use 89 because the last day is counted as a whole day
// Subtract by "daysBetweenTwoMonthsAgoAndOneMonthAgo" (past SIT days) instead of total days used
// This is because the authorized end date is based on the remaining days at the start of the current SIT
authorizedEndDate.setDate(authorizedEndDate.getDate() + 89 - daysBetweenTwoMonthsAgoAndOneMonthAgo);
// format
const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(ninetyDaysFromStartDateInclusive);
const month = new Intl.DateTimeFormat('en', { month: 'short' }).format(ninetyDaysFromStartDateInclusive);
const year = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(ninetyDaysFromStartDateInclusive);
const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(authorizedEndDate);
const month = new Intl.DateTimeFormat('en', { month: 'short' }).format(authorizedEndDate);
const year = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(authorizedEndDate);
const expectedAuthorizedEndDate = `${day} ${month} ${year}`;
// assert
await expect(
Expand Down Expand Up @@ -103,17 +118,11 @@ test.describe('TOO user', () => {
originDepartureDate.setMonth(today.getMonth() - 3);
const originEntryDate = new Date(today);
originEntryDate.setMonth(today.getMonth() - 4);
// get the time diff
const destinationTimeDiff = destinationDepartureDate.getTime() - destinationEntryDate.getTime();
const originTimeDiff = originDepartureDate.getTime() - originEntryDate.getTime();
// get the days, converting milliseconds to days
const destinationDaysDiff = destinationTimeDiff / (1000 * 60 * 60 * 24);
const originDaysDiff = originTimeDiff / (1000 * 60 * 60 * 24);
// be inclusive of the last day
const totalDaysBetweenDestinationInclusive = destinationDaysDiff + 1;
const totalDaysBetweenOriginInclusive = originDaysDiff + 1;
// days between
const totalDaysBetweenDestination = calculateDaysDiff(destinationEntryDate, destinationDepartureDate);
const totalDaysBetweenOrigin = calculateDaysDiff(originEntryDate, originDepartureDate);
// get sums
const totalDaysUsed = totalDaysBetweenDestinationInclusive + totalDaysBetweenOriginInclusive;
const totalDaysUsed = totalDaysBetweenDestination + totalDaysBetweenOrigin;
const remainingDays = 90 - totalDaysUsed;
// assert sums
await expect(
Expand All @@ -127,13 +136,13 @@ test.describe('TOO user', () => {
await expect(
page
.getByTestId('previouslyUsedSitTable')
.getByText(`${totalDaysBetweenDestinationInclusive} days at destination`, { exact: false })
.getByText(`${totalDaysBetweenDestination} days at destination`, { exact: false })
.first(),
).toBeVisible();
await expect(
page
.getByTestId('previouslyUsedSitTable')
.getByText(`${totalDaysBetweenOriginInclusive} days at origin`, { exact: false })
.getByText(`${totalDaysBetweenOrigin} days at origin`, { exact: false })
.first(),
).toBeVisible();
});
Expand Down
10 changes: 5 additions & 5 deletions playwright/tests/office/txo/tooFlowsNTS.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ test.describe('TOO user', () => {
// Fill out the HHG and NTS accounting codes
await page.getByTestId('hhgTacInput').fill(tac.tac);
const today = new Date();
const formattedDate = new Intl.DateTimeFormat('en-GB', {
day: '2-digit',
month: 'short',
year: 'numeric',
}).format(today);
const day = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(today);
const month = new Intl.DateTimeFormat('en', { month: 'short' }).format(today);
const year = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(today);
const formattedDate = `${day} ${month} ${year}`;

await page.locator('input[name="issueDate"]').fill(formattedDate);

await page.getByTestId('hhgSacInput').fill('4K988AS098F');
Expand Down