Skip to content

Cherry-pick: 8095 #8177

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

Merged
merged 3 commits into from
Oct 9, 2025
Merged

Cherry-pick: 8095 #8177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b360c1
Expanded Time List enhancements for #8091 (#8095)
charlesh88 Sep 17, 2025
123ad91
cherry-pick: Expanded Time List enhancements for #8091 (#8095)
charlesh88 Sep 17, 2025
3170e81
Merge branch 'cherry-pick-expanded-timelist' of https://github.com/na…
shefalijoshi Oct 7, 2025
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
26 changes: 0 additions & 26 deletions e2e/tests/functional/planning/timelistControlledClock.e2e.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ const examplePlanSmall1 = JSON.parse(
const TIME_TO_FROM_COLUMN = 2;
const HEADER_ROW = 0;
const NUM_COLUMNS = 5;
const FULL_CIRCLE_PATH =
'M3.061616997868383e-15,-50A50,50,0,1,1,-3.061616997868383e-15,50A50,50,0,1,1,3.061616997868383e-15,-50Z';

/**
* The regular expression used to parse the countdown string.
Expand Down Expand Up @@ -177,14 +175,6 @@ test.describe('Activity progress when activity is in the future @clock', () => {
await page.clock.resume();
await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
});

test('progress pie is empty', async ({ page }) => {
const anActivity = page.getByRole('row').nth(0);
// Progress pie shows no progress when now is less than the start time
await expect(anActivity.getByLabel('Activity in progress').locator('path')).not.toHaveAttribute(
'd'
);
});
});

test.describe('Activity progress when now is between start and end of the activity @clock', () => {
Expand All @@ -194,13 +184,6 @@ test.describe('Activity progress when now is between start and end of the activi
await page.goto('./', { waitUntil: 'domcontentloaded' });
await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
});

test('progress pie is partially filled', async ({ page }) => {
const anActivity = page.getByRole('row').nth(0);
const pathElement = anActivity.getByLabel('Activity in progress').locator('path');
// Progress pie shows progress when now is greater than the start time
await expect(pathElement).toHaveAttribute('d');
});
});

test.describe('Activity progress when now is after end of the activity @clock', () => {
Expand All @@ -210,15 +193,6 @@ test.describe('Activity progress when now is after end of the activity @clock',
await page.goto('./', { waitUntil: 'domcontentloaded' });
await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
});

test('progress pie is full', async ({ page }) => {
const anActivity = page.getByRole('row').nth(0);
// Progress pie is completely full and doesn't update if now is greater than the end time
await expect(anActivity.getByLabel('Activity in progress').locator('path')).toHaveAttribute(
'd',
FULL_CIRCLE_PATH
);
});
});

/**
Expand Down
54 changes: 0 additions & 54 deletions e2e/tests/visual-a11y/planning-timelist.visual.spec.js
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions e2e/tests/visual-a11y/planning-view.visual.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,17 @@ import { createPlanFromJSON } from '../../appActions.js';
import { scanForA11yViolations, test } from '../../avpFixtures.js';
import { VISUAL_FIXED_URL } from '../../constants.js';
import {
createTimelistWithPlanAndSetActivityInProgress,
getFirstActivity,
setBoundsToSpanAllActivities,
setDraftStatusForPlan
} from '../../helper/planningUtils.js';

const examplePlanSmall1 = JSON.parse(
fs.readFileSync(new URL('../../test-data/examplePlans/ExamplePlan_Small1.json', import.meta.url))
);

const examplePlanSmall2 = JSON.parse(
fs.readFileSync(new URL('../../test-data/examplePlans/ExamplePlan_Small2.json', import.meta.url))
);

const FIRST_ACTIVITY_SMALL_1 = getFirstActivity(examplePlanSmall1);
const FIRST_ACTIVITY_SMALL_2 = getFirstActivity(examplePlanSmall2);

test.describe('Visual - Timelist progress bar @clock @a11y', () => {
test.beforeEach(async ({ page }) => {
await page.clock.install({ time: FIRST_ACTIVITY_SMALL_1.end + 10000 });
await page.clock.resume();
await createTimelistWithPlanAndSetActivityInProgress(page, examplePlanSmall1);
await page.getByLabel('Click to collapse items').click();
});

test('progress pie is full', async ({ page, theme }) => {
// Progress pie is completely full and doesn't update if now is greater than the end time
await percySnapshot(page, `Time List with Activity in Progress (theme: ${theme})`);
});
});

test.describe('Visual - Plan View @a11y', () => {
test.beforeEach(async ({ page }) => {
// Set the clock to the end of the first activity in the plan
Expand Down
Loading
Loading