mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-17 12:42:15 +01:00
Added the ability to disable group similar time entries (#1054)
* Added the ability to disable group similar time entries * Fix E2E test for Group similar time entries * Simplify `TimeEntryGroupedTable` by replacing ternary with early return logic * Refactor time entry grouping settings: rename storage key, move logic into a dedicated module * Replace fixed `waitForTimeout` calls in E2E tests with element-based waits and assertions * Run frontend linting and formatting for changes
This commit is contained in:
@@ -39,6 +39,10 @@ function getMonthFromTimestamp(timestamp: string): number {
|
||||
return new Date(timestamp).getUTCMonth() + 1;
|
||||
}
|
||||
|
||||
async function goToProfilePage(page: Page) {
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
|
||||
}
|
||||
|
||||
async function goToTimeOverview(page: Page) {
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/time');
|
||||
}
|
||||
@@ -67,6 +71,14 @@ async function createEmptyTimeEntry(page: Page) {
|
||||
]);
|
||||
}
|
||||
|
||||
async function setTimeEntriesGrouping(page: Page, enabled: boolean) {
|
||||
await goToProfilePage(page);
|
||||
const checkbox = page.getByLabel('Group similar time entries');
|
||||
const isChecked = await checkbox.isChecked();
|
||||
if (isChecked !== enabled) await checkbox.click();
|
||||
await goToTimeOverview(page);
|
||||
}
|
||||
|
||||
test('test that starting and stopping an empty time entry shows a new time entry in the overview', async ({
|
||||
page,
|
||||
}) => {
|
||||
@@ -333,6 +345,30 @@ test.skip('test that load more works when the end of page is reached', async ({
|
||||
await expect(page.locator('body')).toHaveText(/All time entries are loaded!/);
|
||||
});
|
||||
|
||||
test('test that Group similar time entries option is affected', async ({ page }) => {
|
||||
// Enable grouping
|
||||
await setTimeEntriesGrouping(page, true);
|
||||
|
||||
// Create 2 similar time entries
|
||||
await createEmptyTimeEntry(page);
|
||||
await page.waitForSelector('[data-testid="time_entry_row"]', { timeout: 1000 });
|
||||
await createEmptyTimeEntry(page);
|
||||
|
||||
// Verify similar time entries are grouped
|
||||
await expect(page.getByTestId('grouped_items_count_button').first()).toBeVisible({
|
||||
timeout: 1000,
|
||||
});
|
||||
|
||||
// Disable grouping
|
||||
await setTimeEntriesGrouping(page, false);
|
||||
|
||||
// Verify similar time entries are not grouped
|
||||
await expect(page.locator('[data-testid="time_entry_row"]')).toHaveCount(2, { timeout: 1000 });
|
||||
await expect(page.locator('[data-testid="grouped_items_count_button"]')).toHaveCount(0, {
|
||||
timeout: 1000,
|
||||
});
|
||||
});
|
||||
|
||||
// TODO: Test that updating the time entry start / end times works while it is running
|
||||
|
||||
// TODO: Test for project update
|
||||
|
||||
Reference in New Issue
Block a user