Update e2e tests to be compatible with new logged in user structure

Author: gustavlrsn

test/cypress/integration/00-applications-oauth.test.js

@@ -8,7 +8,7 @@ describe('OAuth Applications', () => {
   });
 
   it('create and edit applications', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/for-developers` });
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/for-developers` });
 
     cy.log('Starts with an empty state');
     cy.contains('[data-cy="oauth-apps-list"]', "You don't have any app yet");
@@ -66,12 +66,12 @@ describe('OAuth Applications', () => {
 
   it('create application with 2fa enabled', () => {
     cy.signup({ user: { name: 'OAuth tester', settings: { features: { adminPanel: true } } } }).then(user => {
-      cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/for-developers` });
+      cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/for-developers` });
 
       const secret = generateSecret({ length: 64 });
       cy.enableTwoFactorAuth({
         userEmail: user.email,
-        userSlug: user.collective.slug,
+        userSlug: user.slug,
         secret: secret,
       });
 
@@ -136,7 +136,7 @@ describe('OAuth Applications', () => {
   // Warning: this test is dependant on the previous one. To make it independent, connect the OAuth app with
   it('can list & revoke authorization tokens in the admin', () => {
     cy.log('App is in list');
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/authorized-apps` });
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/authorized-apps` });
     cy.getByDataCy('connected-oauth-app').should('have.length', 1);
     cy.getByDataCy('connected-oauth-app').should('contain', 'My second App');
 

test/cypress/integration/00-personal-token.test.js

@@ -11,7 +11,7 @@ describe('Personal Token', () => {
   });
 
   it('create and edit personal token', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/for-developers` });
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/for-developers` });
 
     cy.log('Starts with an empty state');
     cy.contains('[data-cy="personal-tokens-list"]', "You don't have any token yet");
@@ -75,12 +75,12 @@ describe('Personal Token', () => {
 
   it('create application with 2fa enabled', () => {
     cy.signup({ user: { name: 'Personal token tester', settings: { features: { adminPanel: true } } } }).then(user => {
-      cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/for-developers` });
+      cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/for-developers` });
 
       const secret = generateSecret({ length: 64 });
       cy.enableTwoFactorAuth({
         userEmail: user.email,
-        userSlug: user.collective.slug,
+        userSlug: user.slug,
         secret: secret,
       });
 

test/cypress/integration/07-password.test.js

@@ -10,7 +10,7 @@ describe('passwords', () => {
   });
 
   it('can be set from the settings page', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/user-security` });
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/user-security` });
     cy.contains("Setting a password is optional but can be useful if you're using a password manager.");
 
     // Submit disabled because no password set
@@ -52,7 +52,7 @@ describe('passwords', () => {
   });
 
   it('can then be edited', () => {
-    cy.login({ sendLink: true, email: user.email, redirect: `/dashboard/${user.collective.slug}/user-security` });
+    cy.login({ sendLink: true, email: user.email, redirect: `/dashboard/${user.slug}/user-security` });
 
     // Disable button if form is not complete
     cy.contains('button', 'Update Password').should('be.disabled');
@@ -105,8 +105,8 @@ describe('passwords', () => {
     cy.getByDataCy('user-menu-trigger').click();
     cy.getByDataCy('logout').click();
 
-    // Login with password on protected page (`/${user.collective.slug}/dashboard/user-security`)
-    cy.visit(`/dashboard/${user.collective.slug}/user-security`);
+    // Login with password on protected page (`/${user.slug}/dashboard/user-security`)
+    cy.visit(`/dashboard/${user.slug}/user-security`);
     completeSignInForm();
   });
 
@@ -154,10 +154,10 @@ describe('passwords', () => {
   it('can be used in combination with 2FA', () => {
     // Enable 2FA on user
     const secret = generateSecret({ length: 64 });
-    cy.enableTwoFactorAuth({ userEmail: user.email, userSlug: user.collective.slug, secret: secret });
+    cy.enableTwoFactorAuth({ userEmail: user.email, userSlug: user.slug, secret: secret });
 
     // Sign-in flow
-    cy.visit(`/signin?next=/dashboard/${user.collective.slug}/info`);
+    cy.visit(`/signin?next=/dashboard/${user.slug}/info`);
     cy.get('input[name="email"]').type(user.email);
     cy.getByDataCy('signin-btn').click();
     cy.get('input[name="password"]:visible').type('strongNewP@ssword<>?');

test/cypress/integration/07-signin.test.js

@@ -111,7 +111,7 @@ describe('signin with 2FA', () => {
         secret = generateSecret({ length: 64 });
         return await cy.enableTwoFactorAuth({
           userEmail: user.email,
-          userSlug: user.collective.slug,
+          userSlug: user.slug,
           secret: secret,
         });
       })

test/cypress/integration/07-whitelabel.signin.test.js

@@ -57,7 +57,7 @@ describe('white-label signin', () => {
         .then(() => {
           return cy.enableTwoFactorAuth({
             userEmail: user.email,
-            userSlug: user.collective.slug,
+            userSlug: user.slug,
             secret: secret,
           });
         });

test/cypress/integration/08-user.change-email.test.js

@@ -15,7 +15,7 @@ describe('Users can change their email address', () => {
 
   it('uses a form in advanced settings', () => {
     // Go to /dashboard/:collective/advanced
-    cy.visit(`/dashboard/${user.collective.slug}/advanced`);
+    cy.visit(`/dashboard/${user.slug}/advanced`);
 
     // Initial form should have current email in it
     cy.get('[data-cy=EditUserEmailForm] input[name=email]').should('have.value', user.email);
@@ -61,7 +61,7 @@ describe('Users can change their email address', () => {
   it('can re-send the confirmation email', () => {
     const emailForDoubleConfirmation = randomEmail();
 
-    cy.login({ email: newEmail, redirect: `/dashboard/${user.collective.slug}/advanced` });
+    cy.login({ email: newEmail, redirect: `/dashboard/${user.slug}/advanced` });
     cy.get('[data-cy=EditUserEmailForm] input[name=email]').type(`{selectall}${emailForDoubleConfirmation}`);
     cy.contains('[data-cy=EditUserEmailForm] button', 'Confirm new email').click();
     cy.contains('[data-cy=EditUserEmailForm] button', 'Re-send confirmation').click();

test/cypress/integration/27-expenses.test.js

@@ -767,7 +767,7 @@ describe('Expense flow', () => {
         type: 'INVOICE',
         userEmail: user.email,
         account: { legacyId: collective.id },
-        payee: { legacyId: user.CollectiveId },
+        payee: { id: user.id },
         description: 'Expense for E2E tests',
       }).then(createdExpense => {
         expense = createdExpense;

test/cypress/integration/29-host.admin.test.js

@@ -244,7 +244,7 @@ describe('host dashboard', () => {
       cy.createExpense({
         userEmail: user.email,
         account: { legacyId: 207 },
-        payee: { legacyId: user.CollectiveId },
+        payee: { id: user.id },
       }).as('expense');
     });
 

test/cypress/integration/34-expenses.comment.test.js

@@ -14,7 +14,7 @@ describe('New Expense Flow comments', () => {
   beforeEach(() => {
     cy.createExpense({
       userEmail: user.email,
-      payee: { legacyId: user.CollectiveId },
+      payee: { id: user.id },
       account: { legacyId: collective.id },
     }).then(expense => (expenseUrl = `/${collective.slug}/expenses/${expense.legacyId}`));
   });

test/cypress/integration/39-recurring-contributions.test.js

@@ -33,7 +33,7 @@ describe('Recurring contributions', () => {
   });
 
   it('Has contributions in the right categories', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       // Filter by Yearly frequency
       cy.getByDataCy('add-filter').click();
       cy.contains('Frequency').click();
@@ -57,22 +57,20 @@ describe('Recurring contributions', () => {
       },
     },
     () => {
-      cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(
-        () => {
-          cy.getByDataCy('actions-menu-trigger').first().click();
-          cy.contains('Update payment method').click();
-          cy.get('input[type=radio][value="stripe-payment-element"]').check();
-          cy.wait(500);
-          cy.fillStripePaymentElementInput();
-          cy.getByDataCy('recurring-contribution-submit-pm-button').click();
-          cy.getByDataCy('toast-notification').contains('Your recurring contribution has been updated.');
-        },
-      );
+      cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
+        cy.getByDataCy('actions-menu-trigger').first().click();
+        cy.contains('Update payment method').click();
+        cy.get('input[type=radio][value="stripe-payment-element"]').check();
+        cy.wait(500);
+        cy.fillStripePaymentElementInput();
+        cy.getByDataCy('recurring-contribution-submit-pm-button').click();
+        cy.getByDataCy('toast-notification').contains('Your recurring contribution has been updated.');
+      });
     },
   );
 
   it('Can change the tier and amount of the order', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.contains('Update amount').click();
       cy.contains('[data-cy="recurring-contribution-tier-box"]', 'Backer').within(() => {
@@ -85,7 +83,7 @@ describe('Recurring contributions', () => {
   });
 
   it('Can select a fixed recurring contribution tier', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.contains('Update amount').click();
       cy.contains('[data-cy="recurring-contribution-tier-box"]', 'Recurring Fixed Donation Tier').within(() => {
@@ -98,7 +96,7 @@ describe('Recurring contributions', () => {
   });
 
   it('Can change the amount in a flexible contribution tier', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.contains('Update amount').click();
       cy.contains('[data-cy="recurring-contribution-tier-box"]', 'Sponsor').within(() => {
@@ -113,7 +111,7 @@ describe('Recurring contributions', () => {
   });
 
   it('Can contribute a custom contribution amount', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.contains('Update amount').click();
       cy.contains('[data-cy="recurring-contribution-tier-box"]', 'Sponsor').within(() => {
@@ -133,7 +131,7 @@ describe('Recurring contributions', () => {
   });
 
   it('Cannot contribute a contribution amount less than the minimum allowable amount', () => {
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.contains('Update amount').click();
       cy.contains('[data-cy="recurring-contribution-tier-box"]', 'Sponsor').within(() => {
@@ -153,7 +151,7 @@ describe('Recurring contributions', () => {
 
   it('Can cancel an active contribution with reasons displayed in modal, "other" displays text area', () => {
     cy.mailpitDeleteAllEmails();
-    cy.login({ email: user.email, redirect: `/dashboard/${user.collective.slug}/outgoing-contributions` }).then(() => {
+    cy.login({ email: user.email, redirect: `/dashboard/${user.slug}/outgoing-contributions` }).then(() => {
       cy.getByDataCy('actions-menu-trigger').first().click();
       cy.getByDataCy('recurring-contribution-menu-cancel-option').click();
       cy.getByDataCy('cancel-order-modal').should('exist');