test-playwright/00-noid-tests.spec.ts

@@ -69,8 +69,7 @@
  */
 
 import { test, expect } from '@playwright/test';
-import { UNNAMED_ENTITY_NAME } from '../src/constants/entities';
-import { deleteContact, generateAndRegisterEthrUser, importUser } from './testUtils';
+import { createContactName, generateNewEthrUser, importUser, importUserFromAccount } from './testUtils';
 import { NOTIFY_CONTACT_INVALID_DID } from '../src/constants/notifications';
 
 test('Check activity feed - check that server is running', async ({ page }) => {
@@ -185,35 +184,20 @@ test('Check invalid DID shows error and redirects', async ({ page }) => {
 });
 
 test('Check User 0 can register a random person', async ({ page }) => {
-  await importUser(page, '00');
-  const newDid = await generateAndRegisterEthrUser(page);
-  expect(newDid).toContain('did:ethr:');
-
-  await page.goto('./');
-  await page.getByTestId('closeOnboardingAndFinish').click();
-  await page.getByRole('button', { name: 'Person' }).click();
-      await page.getByRole('listitem').filter({ hasText: UNNAMED_ENTITY_NAME }).locator('svg').click();
-  await page.getByPlaceholder('What was given').fill('Gave me access!');
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-  // now ensure that alert goes away
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-  await expect(page.getByText('That gift was recorded.')).toBeHidden();
-
-  // now delete the contact to test that pages still do reasonable things
-  await deleteContact(page, newDid);
-  // go the activity page for this new person
-  await page.goto('./did/' + encodeURIComponent(newDid));
-  // maybe replace by: const popupPromise = page.waitForEvent('popup');
-  let error;
-  try {
-    await page.waitForSelector('div[role="alert"]', { timeout: 2000 });
-    error = new Error('Error alert should not show.');
-  } catch (error) {
-    // success
-  } finally {
-    if (error) {
-      throw error;
-    }
-  }
+  const newDid = await generateNewEthrUser(page); // generate a new user
+
+  await importUserFromAccount(page, "00"); // switch to User Zero
+
+  // As User Zero, add the new user as a contact
+  await page.goto('./contacts');
+  const contactName = createContactName(newDid);
+  await page.getByPlaceholder('URL or DID, Name, Public Key').fill(`${newDid}, ${contactName}`);
+  await expect(page.locator('button > svg.fa-plus')).toBeVisible();
+  await page.locator('button > svg.fa-plus').click();
+  await expect(page.locator('div[role="alert"] h4:has-text("Success")')).toBeVisible(); // wait for info alert to be visible…
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // …and dismiss it
+  await expect(page.locator('div[role="alert"] button > svg.fa-xmark')).toBeHidden(); // ensure alert is gone
+  await page.locator('div[role="alert"] button:text-is("Yes")').click(); // Register new contact
+  await page.locator('div[role="alert"] button:text-is("No, Not Now")').click(); // Dismiss export data prompt
+  await expect(page.locator("li", { hasText: contactName })).toBeVisible();
 });

test-playwright/testUtils.ts

@@ -109,7 +109,7 @@ export async function switchToUser(page: Page, did: string): Promise<void> {
   await page.getByTestId("didWrapper").locator('code:has-text("did:")');
 }
 
-function createContactName(did: string): string {
+export function createContactName(did: string): string {
   return "User " + did.slice(11, 14);
 }
 
@@ -144,30 +144,6 @@ export async function generateNewEthrUser(page: Page): Promise<string> {
   return newDid;
 }
 
-// Generate a new random user and register them.
-// Note that this makes 000 the active user. Use switchToUser to switch to this DID.
-export async function generateAndRegisterEthrUser(page: Page): Promise<string> {
-  const newDid = await generateNewEthrUser(page);
-
-  await importUser(page, "000"); // switch to user 000
-
-  await page.goto("./contacts");
-  const contactName = createContactName(newDid);
-  await page
-    .getByPlaceholder("URL or DID, Name, Public Key")
-    .fill(`${newDid}, ${contactName}`);
-  await page.locator("button > svg.fa-plus").click();
-  // register them
-  await page.locator('div[role="alert"] button:text-is("Yes")').click();
-  // wait for it to disappear because the next steps may depend on alerts being gone
-  await expect(
-    page.locator('div[role="alert"] button:text-is("Yes")')
-  ).toBeHidden();
-  await expect(page.locator("li", { hasText: contactName })).toBeVisible();
-
-  return newDid;
-}
-
 // Function to generate a random string of specified length
 export async function generateRandomString(length: number): Promise<string> {
   return Math.random()