Add reporting e2e helpers and detailed tests

Author: Onatcer

e2e/members.spec.ts

@@ -3,12 +3,16 @@
 // TODO: Remove Invitation
 import { expect, test } from '../playwright/fixtures';
 import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import type { Page } from '@playwright/test';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
 
-async function goToMembersPage(page) {
+async function goToMembersPage(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/members');
 }
 
-async function openInviteMemberModal(page) {
+async function openInviteMemberModal(page: Page) {
     await Promise.all([
         page.getByRole('button', { name: 'Invite Member' }).click(),
         expect(page.getByPlaceholder('Member Email')).toBeVisible(),
@@ -35,7 +39,7 @@ test('test that new employee can be invited', async ({ page }) => {
     await page.getByRole('button', { name: 'Employee' }).click();
     await Promise.all([
         page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
-        await expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
+        expect(page.getByRole('main')).toContainText(`new+${editorId}@editor.test`),
     ]);
 });
 
@@ -91,3 +95,123 @@ test('test that organization billable rate can be updated with all existing time
         ),
     ]);
 });
+
+async function createPlaceholderMemberViaImport(page: Page, placeholderName: string) {
+    const placeholderEmail = `placeholder+${Math.floor(Math.random() * 100000)}@solidtime-import.test`;
+    const csvContent = [
+        'User,Email,Client,Project,Task,Description,Billable,Start date,Start time,End date,End time,Tags',
+        `${placeholderName},${placeholderEmail},,,,Imported entry,No,2024-01-01,09:00:00,2024-01-01,10:00:00,`,
+    ].join('\n');
+
+    // Write CSV to a temp file for upload
+    const tmpDir = os.tmpdir();
+    const tmpFile = path.join(tmpDir, `import-${Date.now()}.csv`);
+    fs.writeFileSync(tmpFile, csvContent);
+
+    await page.goto(PLAYWRIGHT_BASE_URL + '/import');
+
+    // Select "Toggl Time Entries" import type
+    await page.locator('select#importType').selectOption({ label: 'Toggl Time Entries' });
+
+    // Upload the CSV file
+    await page.locator('input[type="file"]').setInputFiles(tmpFile);
+
+    // Click Import and wait for success
+    await Promise.all([
+        page.getByRole('button', { name: 'Import Data' }).click(),
+        page.waitForResponse(
+            (response) => response.url().includes('/import') && response.status() === 200
+        ),
+    ]);
+
+    // Close the result modal
+    await page.getByRole('button', { name: 'Close' }).click();
+
+    // Clean up temp file
+    fs.unlinkSync(tmpFile);
+}
+
+test('test that changing member role updates the role in the member table', async ({ page }) => {
+    const placeholderName = 'RoleChange ' + Math.floor(Math.random() * 10000);
+
+    // Create a placeholder member via import
+    await createPlaceholderMemberViaImport(page, placeholderName);
+
+    // Go to members page and verify placeholder exists with role "Placeholder"
+    await goToMembersPage(page);
+    const memberRow = page.getByRole('row').filter({ hasText: placeholderName });
+    await expect(memberRow).toBeVisible();
+    await expect(memberRow.getByText('Placeholder')).toBeVisible();
+
+    // Open the edit modal for the placeholder member
+    await memberRow.getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(page.getByRole('heading', { name: 'Update Member' })).toBeVisible();
+
+    // Change role to Employee
+    const roleSelect = page.getByRole('dialog').getByRole('combobox').first();
+    await roleSelect.click();
+    await page.getByRole('option', { name: 'Employee' }).click();
+
+    // Submit the change and verify the API call succeeds
+    await Promise.all([
+        page.getByRole('button', { name: 'Update Member' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/members/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+    ]);
+
+    // Verify dialog closed
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Verify the role updated in the table
+    await expect(memberRow.getByText('Employee')).toBeVisible();
+});
+
+test('test that merging a placeholder member works', async ({ page }) => {
+    const placeholderName = 'Merge Target ' + Math.floor(Math.random() * 10000);
+
+    // Create a placeholder member via import
+    await createPlaceholderMemberViaImport(page, placeholderName);
+
+    // Go to members page
+    await goToMembersPage(page);
+    await expect(page.getByText(placeholderName)).toBeVisible();
+
+    // Find the placeholder member row and open actions menu
+    const placeholderRow = page.getByRole('row').filter({ hasText: placeholderName });
+    await placeholderRow.getByRole('button').click();
+
+    // Click Merge
+    await page.getByTestId('member_merge').click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await expect(page.getByRole('heading', { name: 'Merge Member' })).toBeVisible();
+
+    // Select the current user (the owner) as merge target via MemberCombobox
+    const combobox = page.getByRole('dialog').getByRole('combobox');
+    await combobox.click();
+
+    // Wait for dropdown options to load
+    const firstOption = page.getByRole('option').first();
+    await expect(firstOption).toBeVisible({ timeout: 10000 });
+    await firstOption.click();
+
+    // Submit merge
+    await Promise.all([
+        page.getByRole('button', { name: 'Merge Member' }).click(),
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/member/') && response.url().includes('/merge-into') && response.ok()
+        ),
+    ]);
+
+    // Wait for dialog to close after successful merge
+    await expect(page.getByRole('dialog')).not.toBeVisible();
+
+    // Verify placeholder member is no longer in the members table
+    await expect(page.getByRole('main').getByText(placeholderName)).not.toBeVisible();
+});

e2e/project-members.spec.ts

@@ -32,8 +32,8 @@ test('test that updating project member billable rate works for existing time en
     await page.getByRole('button', { name: 'Add Member' }).click();
 
     await expect(page.getByText('Add Project Member').first()).toBeVisible();
-    await page.getByRole('button', { name: 'Select a member' }).click();
-    await page.keyboard.press('Enter');
+    await page.getByRole('combobox').filter({ hasText: 'Select a member' }).click();
+    await page.getByRole('option').first().click();
     await page.getByRole('button', { name: 'Add Project Member' }).click();
 
     await page