Merge remote-tracking branch 'origin' into feature/workspace-markdown…

…-editor
stakwork · Jan 5, 2025 · 831cc1a · 831cc1a
2 parents c8aaef1 + 365712a
commit 831cc1a
Show file tree

Hide file tree

Showing 11 changed files with 311 additions and 158 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,12 +1,16 @@
-import { defineConfig } from "cypress";
+import { defineConfig } from 'cypress';
 
 export default defineConfig({
   viewportWidth: 1800,
   viewportHeight: 1200,
   video: true,
   e2e: {
+    retries: {
+      runMode: 3,
+      openMode: 1
+    },
     setupNodeEvents(on, config) {
       // implement node event listeners here
-    },
-  },
+    }
+  }
 });
diff --git a/cypress/e2e/23_editWorkspaceDetails.cy.ts b/cypress/e2e/23_editWorkspaceDetails.cy.ts
@@ -12,16 +12,16 @@ describe('Edit Workspace Details', () => {
     website: 'https://updated.org'
   };
 
-  before(() => {
+  it('should edit workspace details successfully', () => {
     cy.login(workspace.loggedInAs);
     cy.wait(1000);
+
     cy.contains(workspace.loggedInAs).click();
     cy.wait(1000);
+
     cy.create_workspace(workspace);
     cy.wait(1000);
-  });
 
-  it('should edit workspace details successfully', () => {
     cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 

diff --git a/cypress/e2e/31_editBountyBySearch.cy.ts b/cypress/e2e/31_editBountyBySearch.cy.ts
@@ -48,7 +48,7 @@ describe('Edit Bounty By Searching, Change Workspace And Assignee', () => {
 
   it('should be able to edit a bounty by searching, changing workspace, amount, coding languages, and assignee', () => {
     cy.create_bounty(bounty);
-    cy.wait(1000);
+    cy.wait(2000);
 
     // Search for the bounty
     cy.get('input').type(bounty.title);
@@ -78,7 +78,7 @@ describe('Edit Bounty By Searching, Change Workspace And Assignee', () => {
     cy.get('[data-testid="org_uuid"]').should('exist').click({ force: true }).wait(5000);
     cy.wait(1000);
     cy.contains(bounty.workspace).should('exist').click({ force: true });
-
+    cy.wait(1000);
     // Assign a new assignee
     cy.get('.SearchInput').type(NewAssignee);
     cy.wait(1000);
@@ -106,7 +106,7 @@ describe('Edit Bounty By Searching, Change Workspace And Assignee', () => {
 
     cy.get('[data-testid="close-btn"]').click(0, 0);
     cy.visit('http://localhost:3007/bounties');
-    cy.wait(1000);
+    cy.wait(5000);
 
     // Verify the bounty changes
     cy.get('input').type(bounty.title);

diff --git a/cypress/e2e/32_bountyModalNavigation.cy.ts b/cypress/e2e/32_bountyModalNavigation.cy.ts
@@ -1,8 +1,8 @@
 describe('Alice tries to create 8 bounties and then assert that he can go to the next and previous bounties', () => {
   it('Create 8 bounties and assert next and previous bounties', () => {
-    let activeUser = 'alice';
+    let activeUser = 'bob';
     cy.login(activeUser);
-    cy.wait(1000);
+    cy.wait(2000);
 
     const assignees = ['', '', '', 'carol', 'carol', 'carol', 'carol', 'carol'];
 
@@ -12,105 +12,105 @@ describe('Alice tries to create 8 bounties and then assert that he can go to the
         category: 'Web development',
         coding_language: ['Typescript'],
         description: 'Lorem Ipsum Dolor',
-        amount: '10000',
+        amount: '20000',
         assign: assignees[i],
         deliverables: 'We are good to go man',
         tribe: '',
         estimate_session_length: 'Less than 3 hour',
         estimate_completion_date: '09/09/2024'
       });
-      cy.wait(1000);
+      cy.wait(2000);
 
       if (i > 5) {
         if (i === 6) {
           cy.contains('Filter').click();
           cy.contains('Assigned').click();
-          cy.wait(1000);
+          cy.wait(2000);
         }
 
         cy.contains(`Navigation Bounty Title ${i}`).click();
-        cy.wait(1000);
+        cy.wait(2000);
 
         cy.contains('Mark as Paid').click();
-        cy.wait(1000);
+        cy.wait(2000);
 
         cy.contains('Next').click();
-        cy.wait(1000);
+        cy.wait(2000);
 
         cy.contains('Skip and Mark Paid').click();
-        cy.wait(1000);
+        cy.wait(2000);
 
         cy.get('body').click(0, 0);
-        cy.wait(1000);
+        cy.wait(2000);
       }
     }
 
     cy.contains('Filter').click();
     cy.contains('Assigned').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     for (let i = 0; i < 3; i++) {
       cy.contains(`Navigation Bounty Title ${i}`);
     }
 
     cy.contains('Navigation Bounty Title 0').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_right').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_left').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
-    cy.get('[data-testid="close-btn"]').click(0, 0);
-    cy.wait(1000);
+    cy.get('[data-testid="close-btn"]').click({ force: true });
+    cy.wait(2000);
 
     cy.contains('Filter').click();
     cy.contains('Paid').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('Navigation Bounty Title 6');
     cy.contains('Navigation Bounty Title 7');
 
     cy.contains('Navigation Bounty Title 6').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_right').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
-    cy.get('[data-testid="close-btn"]').click(0, 0);
-    cy.wait(1000);
+    cy.get('[data-testid="close-btn"]').click({ force: true });
+    cy.wait(2000);
 
     cy.contains('Filter').click();
     cy.contains('Assigned').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     for (let i = 0; i < 8; i++) {
       cy.contains(`Navigation Bounty Title ${i}`);
     }
 
     cy.contains('Navigation Bounty Title 1').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_left').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('Navigation Bounty Title 0');
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_right').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('Navigation Bounty Title 1');
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('chevron_right').click();
-    cy.wait(1000);
+    cy.wait(2000);
 
     cy.contains('Navigation Bounty Title 2');
-    cy.wait(1000);
+    cy.wait(2000);
 
-    cy.get('[data-testid="close-btn"]').click(0, 0);
+    cy.get('[data-testid="close-btn"]').click({ force: true });
     cy.logout(activeUser);
   });
 });
diff --git a/cypress/e2e/42_rolesWithdrawWorkspace.cy.ts b/cypress/e2e/42_rolesWithdrawWorkspace.cy.ts
@@ -9,10 +9,6 @@ describe('Withdraw From Workspace Role Test', () => {
     github: 'https://github.com/amazing'
   };
 
-  beforeEach(() => {
-    cy.clearCookies();
-  });
-
   it('should allow a user with a Withdraw From Workspace role to withdraw from the workspace', () => {
     cy.login(workspace.loggedInAs);
     cy.wait(1000);

diff --git a/cypress/e2e/43_rolesFundWorkspace.cy.ts b/cypress/e2e/43_rolesFundWorkspace.cy.ts
@@ -9,10 +9,6 @@ describe('Fund Workspace Role Test', () => {
     github: 'https://github.com/amazing'
   };
 
-  beforeEach(() => {
-    cy.clearCookies();
-  });
-
   it('Should allow a user with a Fund Workspave role to deposit into the workspace', () => {
     cy.login(workspace.loggedInAs);
     cy.wait(1000);

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -56,6 +56,7 @@ Cypress.Commands.add('login', (userAlias: string) => {
     }
 
     cy.visit('http://localhost:3007');
+    cy.wait(2000);
     cy.contains('Sign in').click();
 
     cy.get('[data-challenge]')
@@ -342,6 +343,7 @@ Cypress.Commands.add('lnurl_login', (seed: string): Cypress.Chainable<string> =>
   }
 
   cy.visit('http://localhost:3007');
+  cy.wait(2000);
   cy.contains('Sign in').click();
 
   cy.contains('Login with LNAUTH').click();
@@ -396,7 +398,7 @@ Cypress.Commands.add('lnurl_login', (seed: string): Cypress.Chainable<string> =>
 });
 
 Cypress.Commands.add('clickAlias', (expectedAlias) => {
-  cy.wait(2000);
+  cy.wait(3000);
   cy.get('[data-testid="loggedInUser"]').within(() => {
     cy.get('[data-testid="alias"]')
       .should(($el) => {

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -17,10 +17,27 @@
 import './commands';
 import nodes from '../fixtures/nodes.json';
 import nodesv2 from '../fixtures/v2nodes.json';
+import { randomString } from '../../src/helpers/helpers-extended';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
 
+const sessionId = randomString(32);
+
+before(() => {
+  sessionStorage.setItem('sphinx_session_id', sessionId);
+});
+
+beforeEach(() => {
+  if (!sessionStorage.getItem('sphinx_session_id')) {
+    sessionStorage.setItem('sphinx_session_id', sessionId);
+  }
+
+  cy.intercept('**/*', (req: any) => {
+    req.headers['x-session-id'] = sessionStorage.getItem('sphinx_session_id');
+  });
+});
+
 async function postAllUsersToTribe() {
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i];

diff --git a/src/bounties/__tests__/bountyTest.spec.ts b/src/bounties/__tests__/bountyTest.spec.ts
@@ -17,6 +17,15 @@ const mockedApi = api as jest.Mocked<typeof api>;
 describe('Bounty Tests', () => {
   beforeAll(() => {
     Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+    const Crypto = {
+      getRandomValues: (arr: Uint8Array) => {
+        for (let i = 0; i < arr.length; i++) {
+          arr[i] = Math.floor(Math.random() * 256);
+        }
+        return arr;
+      }
+    };
+    global.crypto = Crypto as any;
   });
 
   beforeEach(() => {
@@ -37,6 +46,10 @@ describe('Bounty Tests', () => {
   it('should save a new bounty and persist to localStorage', async () => {
     global.fetch = jest.fn();
     mockedApi.post = jest.fn().mockResolvedValue(newBounty);
+
+    mainStore.initializeSessionId();
+    const { sessionId } = mainStore;
+
     await mainStore.saveBounty(newBounty);
     expect(mockedApi.post).toHaveBeenCalledTimes(0);
     expect(global.fetch).toHaveBeenCalledTimes(1);
@@ -45,7 +58,11 @@ describe('Bounty Tests', () => {
       'http://localhost:5002/gobounties?token=undefined',
       {
         body: JSON.stringify(newBounty),
-        headers: { 'Content-Type': 'application/json', 'x-jwt': undefined },
+        headers: {
+          'Content-Type': 'application/json',
+          'x-jwt': undefined,
+          'x-session-id': sessionId
+        },
         method: 'POST',
         mode: 'cors'
       }
@@ -68,11 +85,18 @@ describe('Bounty Tests', () => {
     mockedApi.del = jest.fn().mockResolvedValue({});
     await mainStore.deleteBounty(bountyIdToDelete, publicKeyToDelete);
 
+    mainStore.initializeSessionId();
+    const { sessionId } = mainStore;
+
     const deleteRequestContent = [
       'http://localhost:5002/gobounties?token=undefined',
       {
         body: JSON.stringify(newBounty),
-        headers: { 'Content-Type': 'application/json', 'x-jwt': undefined },
+        headers: {
+          'Content-Type': 'application/json',
+          'x-jwt': undefined,
+          'x-session-id': sessionId
+        },
         method: 'POST',
         mode: 'cors'
       }
@@ -89,11 +113,18 @@ describe('Bounty Tests', () => {
   it('should fetch and persist people bounties to localStorage', async () => {
     await mainStore.getPeopleBounties();
 
+    mainStore.initializeSessionId();
+    const { sessionId } = mainStore;
+
     const peopleRequestContent = [
       'http://localhost:5002/gobounties?token=undefined',
       {
         body: JSON.stringify(newBounty),
-        headers: { 'Content-Type': 'application/json', 'x-jwt': undefined },
+        headers: {
+          'Content-Type': 'application/json',
+          'x-jwt': undefined,
+          'x-session-id': sessionId
+        },
         method: 'POST',
         mode: 'cors'
       }