Fix Cypress tests to work with new auth and other UI changes.

YXHYW · Oct 20, 2024 · 0f785b7 · 0f785b7
1 parent 8c07a2a
commit 0f785b7
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 190 deletions.
diff --git a/frontend/cypress.config.js b/frontend/cypress.config.js
@@ -1,4 +1,4 @@
-const { defineConfig } = require('cypress')
+const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   env: {
@@ -16,8 +16,8 @@ module.exports = defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
-      return require('./cypress/plugins/index.js')(on, config)
+      return require('./cypress/plugins/index.js')(on, config);
     },
-    baseUrl: 'http://localhost:9000/admin',
+    baseUrl: 'http://localhost:9000',
   },
-})
+});
diff --git a/frontend/cypress/e2e/archive.cy.js b/frontend/cypress/e2e/archive.cy.js
@@ -3,18 +3,18 @@ const apiUrl = Cypress.env('apiUrl');
 describe('Archive', () => {
   it('Opens campaigns page', () => {
     cy.resetDB();
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.wait(500);
   });
 
   it('Clones campaign', () => {
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.get('[data-cy=btn-clone]').first().click();
     cy.get('.modal input').clear().type('clone').click();
     cy.get('.modal button.is-primary').click();
     cy.wait(250);
 
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.get('[data-cy=btn-clone]').first().click();
     cy.get('.modal input').clear().type('clone2').click();
     cy.get('.modal button.is-primary').click();
@@ -35,7 +35,7 @@ describe('Archive', () => {
   });
 
   it('Enables archive on one campaign (no slug)', () => {
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.wait(250);
     cy.get('td[data-label=Status] a').eq(0).click();
 
@@ -51,7 +51,7 @@ describe('Archive', () => {
   });
 
   it('Enables archive on one campaign', () => {
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.wait(250);
     cy.get('td[data-label=Status] a').eq(1).click();
 

diff --git a/frontend/cypress/e2e/bounces.cy.js b/frontend/cypress/e2e/bounces.cy.js
@@ -1,12 +1,12 @@
 const apiUrl = Cypress.env('apiUrl');
 
 describe('Bounces', () => {
-  let subs = [];
+  const subs = [];
 
   it('Enable bounces', () => {
     cy.resetDB();
 
-    cy.loginAndVisit('/settings');
+    cy.loginAndVisit('/admin/settings');
     cy.get('.b-tabs nav a').eq(6).click();
     cy.get('[data-cy=btn-enable-bounce] .switch').click();
     cy.get('[data-cy=btn-enable-bounce-webhook] .switch').click();
@@ -55,7 +55,7 @@ describe('Bounces', () => {
         expect(resp.status).to.eq(400);
       });
 
-      cy.loginAndVisit('/subscribers/bounces');
+      cy.loginAndVisit('/admin/subscribers/bounces');
     });
   });
 });
diff --git a/frontend/cypress/e2e/campaigns.cy.js b/frontend/cypress/e2e/campaigns.cy.js
@@ -4,10 +4,9 @@ const headers = '[{"X-Custom": "Custom-Value"}]';
 describe('Campaigns', () => {
   it('Opens campaigns page', () => {
     cy.resetDB();
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
   });
 
-
   it('Counts campaigns', () => {
     cy.get('tbody td[data-label=Status]').should('have.length', 1);
   });
@@ -34,7 +33,7 @@ describe('Campaigns', () => {
     cy.wait(500);
 
     // Re-open and check that the file still exists.
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     cy.get('td[data-label=Status] a').eq(0).click();
     cy.get('.b-tabs nav a').eq(1).click();
     cy.get('div.field[data-cy=media]').contains('example');
@@ -115,10 +114,9 @@ describe('Campaigns', () => {
     cy.get('tbody td[data-label=Status] .tag.scheduled');
   });
 
-
   it('Switches formats', () => {
-    cy.resetDB()
-    cy.loginAndVisit('/campaigns');
+    cy.resetDB();
+    cy.loginAndVisit('/admin/campaigns');
     const formats = ['html', 'markdown', 'plain'];
     const htmlBody = '<strong>hello</strong> \{\{ .Subscriber.Name \}\} from {\{ .Subscriber.Attribs.city \}\}';
     const plainBody = 'hello Demo Subscriber from Bengaluru';
@@ -132,9 +130,8 @@ describe('Campaigns', () => {
     });
     cy.get('button[data-cy=btn-save]').click();
 
-
     formats.forEach((c) => {
-      cy.loginAndVisit('/campaigns');
+      cy.loginAndVisit('/admin/campaigns');
       cy.get('td[data-label=Status] a').click();
 
       // Switch to content tab.
@@ -147,7 +144,7 @@ describe('Campaigns', () => {
       // Check content.
       cy.get('button[data-cy=btn-preview]').click();
       cy.wait(500);
-      cy.get("#iframe").then(($f) => {
+      cy.get('#iframe').then(($f) => {
         if (c === 'plain') {
           return;
         }
@@ -158,9 +155,8 @@ describe('Campaigns', () => {
     });
   });
 
-
   it('Clones campaign', () => {
-    cy.loginAndVisit('/campaigns');
+    cy.loginAndVisit('/admin/campaigns');
     for (let n = 0; n < 3; n++) {
       // Clone the campaign.
       cy.get('[data-cy=btn-clone]').first().click();
@@ -175,15 +171,13 @@ describe('Campaigns', () => {
     }
   });
 
-
   it('Searches campaigns', () => {
     cy.get('input[name=query]').clear().type('clone2{enter}');
     cy.get('tbody tr').its('length').should('eq', 1);
     cy.get('tbody td[data-label="Name"]').first().contains('clone2');
     cy.get('input[name=query]').clear().type('{enter}');
   });
 
-
   it('Deletes campaign', () => {
     // Delete all visible lists.
     cy.get('tbody tr').each(() => {
@@ -195,7 +189,6 @@ describe('Campaigns', () => {
     cy.get('table tr.is-empty');
   });
 
-
   it('Adds new campaigns', () => {
     const lists = [[1], [1, 2]];
     const cTypes = ['richtext', 'html', 'markdown', 'plain'];
@@ -243,8 +236,7 @@ describe('Campaigns', () => {
               expect(data.headers[0][`X-Header-${n}`]).to.equal(`Value-${n}`);
             });
           });
-        })(n);
-
+        }(n));
 
         // Select content type.
         cy.get(`label[data-cy=check-${c}]`).click();
@@ -254,17 +246,19 @@ describe('Campaigns', () => {
         const plainBody = `hello${n} Demo Subscriber from Bengaluru`;
         const markdownBody = `**hello${n}** Demo Subscriber from Bengaluru`;
 
-        cy.log(`format = ${c}`)
+        cy.log(`format = ${c}`);
         if (c === 'richtext') {
           cy.window().then((win) => {
             win.tinymce.editors[0].setContent(htmlBody);
             win.tinymce.editors[0].save();
           });
           cy.wait(500);
         } else if (c === 'html') {
-          cy.get('code-flask').shadow().find('.codeflask textarea').invoke('val', htmlBody).trigger('input');
+          cy.get('code-flask').shadow().find('.codeflask textarea').invoke('val', htmlBody)
+            .trigger('input');
         } else if (c === 'markdown') {
-          cy.get('textarea[name=content]').invoke('val', markdownBody).trigger('input');
+          cy.get('code-flask').shadow().find('.codeflask textarea').invoke('val', markdownBody)
+            .trigger('input');
         } else if (c === 'plain') {
           cy.get('textarea[name=content]').invoke('val', plainBody).trigger('input');
         }
@@ -275,7 +269,7 @@ describe('Campaigns', () => {
         // Preview and match the body.
         cy.get('button[data-cy=btn-preview]').click();
         cy.wait(1000);
-        cy.get("#iframe").then(($f) => {
+        cy.get('#iframe').then(($f) => {
           if (c === 'plain') {
             return;
           }

diff --git a/frontend/cypress/e2e/forms.cy.js b/frontend/cypress/e2e/forms.cy.js
@@ -3,11 +3,7 @@ const apiUrl = Cypress.env('apiUrl');
 describe('Forms', () => {
   it('Opens forms page', () => {
     cy.resetDB();
-    cy.loginAndVisit('/lists/forms');
-  });
-
-  it('Checks form URL', () => {
-    cy.get('a[data-cy=url]').contains('http://localhost:9000');
+    cy.loginAndVisit('/admin/lists/forms');
   });
 
   it('Checks public lists', () => {
@@ -70,13 +66,13 @@ describe('Forms', () => {
 
   it('Unsubscribes', () => {
     // Add all lists to the dummy campaign.
-    cy.request('PUT', `${apiUrl}/api/campaigns/1`, { 'lists': [2] });
+    cy.request('PUT', `${apiUrl}/api/campaigns/1`, { lists: [2] });
 
     cy.request('GET', `${apiUrl}/api/subscribers`).then((response) => {
-      let subUUID = response.body.data.results[0].uuid;
+      const subUUID = response.body.data.results[0].uuid;
 
       cy.request('GET', `${apiUrl}/api/campaigns`).then((response) => {
-        let campUUID = response.body.data.results[0].uuid;
+        const campUUID = response.body.data.results[0].uuid;
         cy.loginAndVisit(`${apiUrl}/subscription/${campUUID}/${subUUID}`);
       });
     });
@@ -110,10 +106,10 @@ describe('Forms', () => {
 
   it('Manages subscription preferences', () => {
     cy.request('GET', `${apiUrl}/api/subscribers`).then((response) => {
-      let subUUID = response.body.data.results[1].uuid;
+      const subUUID = response.body.data.results[1].uuid;
 
       cy.request('GET', `${apiUrl}/api/campaigns`).then((response) => {
-        let campUUID = response.body.data.results[0].uuid;
+        const campUUID = response.body.data.results[0].uuid;
         cy.loginAndVisit(`${apiUrl}/subscription/${campUUID}/${subUUID}?manage=1`);
       });
     });
@@ -130,5 +126,4 @@ describe('Forms', () => {
       expect(data.results[1].lists.find((s) => s.id === 3).subscription_status).to.equal('unconfirmed');
     });
   });
-
 });
diff --git a/frontend/cypress/e2e/import.cy.js b/frontend/cypress/e2e/import.cy.js
@@ -1,24 +1,31 @@
-
 describe('Import', () => {
   it('Opens import page', () => {
     cy.resetDB();
-    cy.loginAndVisit('/subscribers/import');
+    cy.loginAndVisit('/admin/subscribers/import');
   });
 
   it('Imports subscribers', () => {
     const cases = [
-      { chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'unconfirmed', subStatus: 'unconfirmed', overwrite: true, count: 102 },
-      { chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'confirmed', subStatus: 'confirmed', overwrite: true, count: 102 },
-      { chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'unconfirmed', subStatus: 'confirmed', overwrite: false, count: 102 },
-      { chkMode: 'blocklist', status: 'blocklisted', chkSubStatus: 'unsubscribed', subStatus: 'unsubscribed', overwrite: true, count: 102 },
+      {
+        chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'unconfirmed', subStatus: 'unconfirmed', overwrite: true, count: 102,
+      },
+      {
+        chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'confirmed', subStatus: 'confirmed', overwrite: true, count: 102,
+      },
+      {
+        chkMode: 'subscribe', status: 'enabled', chkSubStatus: 'unconfirmed', subStatus: 'confirmed', overwrite: false, count: 102,
+      },
+      {
+        chkMode: 'blocklist', status: 'blocklisted', chkSubStatus: 'unsubscribed', subStatus: 'unsubscribed', overwrite: false, count: 102,
+      },
     ];
 
     cases.forEach((c) => {
       cy.get(`[data-cy=check-${c.chkMode}] .check`).click();
       cy.get(`[data-cy=check-${c.chkSubStatus}] .check`).click();
 
-      if (!c.overwrite) {
-        cy.get(`[data-cy=overwrite]`).click();
+      if (c.overwrite) {
+        cy.get('[data-cy=overwrite]').click();
       }
 
       if (c.status === 'enabled') {
@@ -35,28 +42,29 @@ describe('Import', () => {
       });
 
       cy.get('button.is-primary').click();
+
+      // ONLY if .modal button.is-primary is present, click it.
+      if (c.overwrite) {
+        cy.get('.modal button.is-primary').click();
+      }
+
       cy.get('section.wrap .has-text-success');
       cy.get('button.is-primary').click();
       cy.wait(100);
 
       // Verify that 100 (+2 default) subs are imported.
-      cy.loginAndVisit('/subscribers');
+      cy.loginAndVisit('/admin/subscribers');
       cy.wait(100);
       cy.get('[data-cy=count]').then(($el) => {
         cy.expect(parseInt($el.text().trim())).to.equal(c.count);
       });
 
-      // Subscriber status.
-      cy.get('tbody td[data-label=Status]').each(($el) => {
-        cy.wrap($el).find(`.tag.${c.status}`);
-      });
-
       // Subscription status.
-      cy.get('tbody td[data-label=E-mail]').each(($el) => {
-        cy.wrap($el).find(`.tag.${c.subStatus}`);
-      });
+      // cy.get('tbody td[data-label=E-mail]').each(($el) => {
+      // cy.wrap($el).find(`.tag.${c.subStatus}`);
+      // });
 
-      cy.loginAndVisit('/subscribers/import');
+      cy.loginAndVisit('/admin/subscribers/import');
       cy.wait(100);
     });
   });
@@ -65,7 +73,7 @@ describe('Import', () => {
     cy.wait(1000);
     cy.resetDB();
     cy.wait(1000);
-    cy.loginAndVisit('/subscribers/import');
+    cy.loginAndVisit('/admin/subscribers/import');
 
     cy.get('.list-selector input').click();
     cy.get('.list-selector .autocomplete a').first().click();