Merge branch 'master' into test-playwright

test-playwright/20-create-project.spec.ts

@@ -12,8 +12,8 @@ test('Create new project, then search for it', async ({ page }) => {
   const finalRandomString = randomString.substring(0, 16);
 
   // Standard texts
-  const standardTitle = "Idea ";
-  const standardDescription = "Description of Idea ";
+  const standardTitle = 'Idea ';
+  const standardDescription = 'Description of Idea ';
 
   // Combine texts with the random string
   const finalTitle = standardTitle + finalRandomString;
@@ -43,12 +43,10 @@ test('Create new project, then search for it', async ({ page }) => {
   // Search for newly-created project in /projects
   await page.goto('./projects');
   await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await page.waitForTimeout(3000); // Wait for a bit
   await expect(page.locator('ul#listProjects li.border-b:nth-child(1)')).toContainText(finalRandomString); // Assumes newest project always appears first in the Projects tab list
 
   // Search for newly-created project in /discover
   await page.goto('./discover');
-  await page.waitForTimeout(3000); // Wait for a bit
   await page.getByPlaceholder('Search…').fill(finalRandomString);
   await page.locator('#QuickSearch button').click();
   await expect(page.locator('ul#listDiscoverResults li.border-b:nth-child(1)')).toContainText(finalRandomString);

test-playwright/30-record-gift.spec.ts

@@ -2,23 +2,17 @@ import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
 test('Record something given', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
+  // Generate a random string of a few characters
+  const randomString = Math.random().toString(36).substring(2, 6);
 
   // Generate a random non-zero single-digit number
   const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
 
   // Standard title prefix
-  const standardTitle = "Gift ";
+  const standardTitle = 'Gift ';
 
   // Combine title prefix with the random string
-  const finalTitle = standardTitle + finalRandomString;
+  const finalTitle = standardTitle + randomString;
 
   // Import user 00
   await importUser(page, '00');
@@ -27,7 +21,7 @@ test('Record something given', async ({ page }) => {
   await page.goto('./');
   await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
   await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton', { id: 'inputGivenAmount' }).fill(randomNonZeroNumber.toString());
+  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
   await page.getByRole('button', { name: 'Sign & Send' }).click();
   await expect(page.getByText('That gift was recorded.')).toBeVisible();
 

test-playwright/35-record-gift-from-image-share.spec.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import { test, expect } from '@playwright/test';
+import { importUser } from './testUtils';
 
 test('Record item given from image-share', async ({ page }) => {
 
@@ -8,11 +9,7 @@ test('Record item given from image-share', async ({ page }) => {
   // Combine title prefix with the random string
   const finalTitle = `Gift ${randomString} from image-share`;
 
-  // Create new ID using seed phrase "rigid shrug mobile…"
-  await page.goto('./start');
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill('rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage');
-  await page.getByRole('button', { name: 'Import' }).click();
+  await importUser(page, '00');
 
   // Record something given
   await page.goto('./test');
@@ -37,4 +34,36 @@ test('Record item given from image-share', async ({ page }) => {
   await page.goto('./');
   const item1 = page.locator('li').filter({ hasText: finalTitle });
   await expect(item1.getByRole('img')).toBeVisible();
-});
+});
+
+// // I believe there's a way to test this service worker feature.
+// // The following is what I got from ChatGPT. I wonder if it doesn't work because it's not registering the service worker correctly.
+//
+// test('Trigger a photo-sharing fetch event in service worker with POST to /share-target', async ({ page }) => {
+//   await importUser(page, '00');
+//
+//   // Create a FormData object with a photo
+//   const photoPath = path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png');
+//   const photoContent = await fs.readFileSync(photoPath);
+//   const [response] = await Promise.all([
+//     page.waitForResponse(response => response.url().includes('/share-target')), // also check for response.status() === 303 ?
+//     page.evaluate(async (photoContent) => {
+//       const formData = new FormData();
+//       formData.append('photo', new Blob([photoContent], { type: 'image/png' }), 'test-photo.jpg');
+//
+//       const response = await fetch('/share-target', {
+//         method: 'POST',
+//         body: formData,
+//       });
+//
+//       return response;
+//     }, photoContent)
+//   ]);
+//
+//   // Verify the response redirected to /shared-photo
+//   //expect(response.status).toBe(303);
+//   console.log('response headers', response.headers());
+//   console.log('response status', response.status());
+//   console.log('response url', response.url());
+//   expect(response.url()).toContain('/shared-photo');
+// });

test-playwright/40-add-contact.spec.ts

@@ -15,20 +15,20 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {
   const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
 
   // Standard title prefix
-  const standardTitle = "Gift ";
+  const standardTitle = 'Gift ';
 
   // Combine title prefix with the random string
   const finalTitle = standardTitle + finalRandomString;
 
   // Contact name
-  const contactName = 'Contact 00';
+  const contactName = 'Contact #000';
 
   // Import user 01
   await importUser(page, '01');
 
   // Add new contact 00
   await page.goto('./contacts');
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F');
+  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F, User #000');
   await page.locator('button > svg.fa-plus').click();
   await expect(page.locator('div[role="alert"]')).toBeVisible();
   
@@ -36,10 +36,11 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {
   // await page.locator('div[role="alert"] button:has-text("Yes")').click();
 
   // Verify added contact
-  await expect(page.locator('li.border-b')).toContainText('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F');
+  await expect(page.locator('li.border-b')).toContainText('User #000');
 
   // Rename contact
-  await page.locator('li.border-b h2 > button[title="Edit"]').click();
+  await page.locator('li.border-b div div > a[title="See more about this person"]').click();
+  await page.locator('h2 > button[title="Edit"]').click();
   await expect(page.locator('div.dialog-overlay > div.dialog').filter({ hasText: 'Edit Name' })).toBeVisible();
   await page.getByPlaceholder('Name', { exact: true }).fill(contactName);
   await page.locator('.dialog > .flex > button').first().click();
@@ -82,4 +83,4 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {
   // Refresh claim page, Confirm button should be hidden
   await page.reload();
   await expect(page.getByRole('button', { name: 'Confirm' })).toBeHidden();
-});
+});

test-playwright/50-record-offer.spec.ts

@@ -0,0 +1,63 @@
+import { test, expect } from '@playwright/test';
+import { importUser } from './testUtils';
+
+test('Record an offer', async ({ page }) => {
+  // Generate a random string of 3 characters, skipping the "0." at the beginning
+  const randomString = Math.random().toString(36).substring(2, 5);
+  // Standard title prefix
+  const description = `Offering of ${randomString}`;
+  const updatedDescription = `Updated ${description}`;
+  const randomNonZeroNumber = Math.floor(Math.random() * 998) + 1;
+
+  // Create new ID for default user
+  await importUser(page);
+
+  // Select a project
+  await page.goto('./discover');
+  await page.locator('ul#listDiscoverResults li:nth-child(1)').click();
+
+  // Record an offer
+  await page.getByTestId('offerButton').click();
+  await page.getByTestId('inputDescription').fill(description);
+  await page.getByTestId('inputOfferAmount').fill(randomNonZeroNumber.toString());
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
+  await expect(page.getByText('That offer was recorded.')).toBeVisible();
+
+  // go to the offer and check the values
+  await page.goto('./projects');
+  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
+  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
+  await expect(page.getByText(description, { exact: true })).toBeVisible();
+  const serverPagePromise = page.waitForEvent('popup');
+  await page.getByRole('link', { name: 'View on the Public Server' }).click();
+  const serverPage = await serverPagePromise;
+  await serverPage.getByText(description);
+  await serverPage.getByText('did:none:HIDDEN');
+
+  // Now update that offer
+
+  // find the edit page and check the old values again
+  await page.goto('./projects');
+  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
+  await page.getByTestId('editClaimButton').click();
+  await page.locator('heading', { hasText: 'What is offered' }).isVisible();
+  const itemDesc = await page.getByTestId('itemDescription');
+  await expect(itemDesc).toHaveValue(description);
+  const amount = await page.getByTestId('inputOfferAmount');
+  await expect(amount).toHaveValue(randomNonZeroNumber.toString());
+  // update the values
+  await itemDesc.fill(updatedDescription);
+  await amount.fill(String(randomNonZeroNumber + 1));
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
+
+  // go to the offer claim again and check the updated values
+  await page.goto('./projects');
+  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
+  const newItemDesc = await page.getByTestId('description');
+  await expect(newItemDesc).toHaveText(updatedDescription);
+
+  // go to edit page
+  await page.getByTestId('editClaimButton').click();
+  const newAmount = await page.getByTestId('inputOfferAmount');
+  await expect(newAmount).toHaveValue((randomNonZeroNumber + 1).toString());
+});

test-playwright/testUtils.ts

@@ -1,6 +1,6 @@
-import { expect } from '@playwright/test';
+import { expect, Page } from '@playwright/test';
 
-export async function importUser(page, id) {
+export async function importUser(page: Page, id?: string): Promise<void> {
   let seedPhrase, userName, did;
 
   // Set seed phrase and DID based on user ID
@@ -21,6 +21,8 @@ export async function importUser(page, id) {
   await page.getByText('You have a seed').click();
   await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
   await page.getByRole('button', { name: 'Import' }).click();
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
 
   // Set name
   await page.getByRole('link', { name: 'Set Your Name' }).click();