Adds notification tests and updates server middleware tests

cypress.config.js

@@ -11,5 +11,6 @@ export default defineConfig({
     videosFolder: 'test/e2e/setup/videos',
     downloadsFolder: 'test/e2e/setup/downloads',
     supportFile: 'test/e2e/setup/support/e2e.js',
+    experimentalRunAllSpecs: true,
   },
 });

shared/validators/notifications/discord.js

@@ -1,14 +1,12 @@
 // messageType: type of message for discord webhook (basic, pretty, nerdy)
 // friendlyName: friendly name for discord webhook
-// textMessage: text message for discord webhook (optional)
 // token: url for discord webhook
 // username: username for discord webhook (optional)
 
 import { NotificationValidatorError } from '../../utils/errors.js';
 
-const friendlyNameRegex = /^[a-zA-Z0-9_ ]+$/;
+const friendlyNameRegex = /^[a-zA-Z0-9_-]+$/;
 const messageTypes = ['basic', 'pretty', 'nerdy'];
-const textMessageRegex = /^[a-zA-Z0-9_ ]+$/;
 const tokenRegex =
   /^https:\/\/discord.com\/api\/webhooks\/[0-9]+\/[0-9a-zA-Z_.-]+$/;
 const usernameRegex = /^[a-zA-Z0-9_]{1,32}$/;
@@ -23,18 +21,14 @@ const Discord = ({
   if (friendlyNameRegex && !friendlyNameRegex.test(friendlyName)) {
     throw new NotificationValidatorError(
       'friendlyName',
-      'Invalid Friendly Name. Must be alphanumeric, Spaces, and underscores only.'
+      'Invalid Friendly Name. Must be alphanumeric, dashes, and underscores only.'
     );
   }
 
   if (!messageTypes.includes(messageType)) {
     throw new NotificationValidatorError('messageType', 'Invalid Message Type');
   }
 
-  if (textMessage && !textMessageRegex.test(textMessage)) {
-    throw new NotificationValidatorError('textMessage', 'Invalid Text Message');
-  }
-
   if (!tokenRegex.test(token)) {
     throw new NotificationValidatorError(
       'token',

shared/validators/notifications/slack.js

@@ -7,10 +7,9 @@
 
 import { NotificationValidatorError } from '../../utils/errors.js';
 
-const channelRegex = /^#[a-zA-Z0-9_]{1,32}$/;
-const friendlyNameRegex = /^[a-zA-Z0-9_ ]+$/;
+const channelRegex = /^[a-z0-9][a-z0-9_-]{0,79}$/;
+const friendlyNameRegex = /^[a-zA-Z0-9_-]+$/;
 const messageTypes = ['basic', 'pretty', 'nerdy'];
-const textMessageRegex = /^[a-zA-Z0-9_ ]+$/;
 const tokenRegex =
   /^https:\/\/hooks.slack.com\/services\/[0-9a-zA-Z]+\/[0-9a-zA-Z]+\/[0-9a-zA-Z]+$/;
 const usernameRegex = /^[a-zA-Z0-9_]{1,32}$/;
@@ -26,7 +25,7 @@ const Slack = ({
   if (friendlyNameRegex && !friendlyNameRegex.test(friendlyName)) {
     throw new NotificationValidatorError(
       'friendlyName',
-      'Invalid Friendly Name. Must be alphanumeric, Spaces, and underscores only.'
+      'Invalid Friendly Name. Must be alphanumeric, dashes, and underscores only.'
     );
   }
 
@@ -38,10 +37,6 @@ const Slack = ({
     throw new NotificationValidatorError('messageType', 'Invalid Message Type');
   }
 
-  if (textMessage && !textMessageRegex.test(textMessage)) {
-    throw new NotificationValidatorError('textMessage', 'Invalid Text Message');
-  }
-
   if (!tokenRegex.test(token)) {
     throw new NotificationValidatorError('token', 'Invalid Slack Webhook URL');
   }

shared/validators/notifications/telegram.js

@@ -8,7 +8,7 @@
 import { NotificationValidatorError } from '../../utils/errors.js';
 
 const chatIdRegex = /^[0-9]+$/;
-const friendlyNameRegex = /^[a-zA-Z0-9_ ]+$/;
+const friendlyNameRegex = /^[a-zA-Z0-9_-]+$/;
 const messageTypes = ['basic', 'pretty', 'nerdy'];
 const tokenRegex = /^[a-zA-Z0-9_]{1,32}$/;
 
@@ -23,7 +23,7 @@ const Telegram = ({
   if (friendlyNameRegex && !friendlyNameRegex.test(friendlyName)) {
     throw new NotificationValidatorError(
       'friendlyName',
-      'Invalid Friendly Name. Must be alphanumeric, Spaces, and underscores only.'
+      'Invalid Friendly Name. Must be alphanumeric, dashes, and underscores only.'
     );
   }
 
@@ -52,7 +52,7 @@ const Telegram = ({
   if (!tokenRegex.test(token)) {
     throw new NotificationValidatorError(
       'token',
-      'Invalid Telegram Webhook URL'
+      'Invalid Telegram Bot Token'
     );
   }
 

shared/validators/notifications/webhook.js

@@ -7,7 +7,7 @@
 
 import { NotificationValidatorError } from '../../utils/errors.js';
 
-const friendlyNameRegex = /^[a-zA-Z0-9_ ]+$/;
+const friendlyNameRegex = /^[a-zA-Z0-9_-]+$/;
 const messageTypes = ['basic', 'pretty', 'nerdy'];
 const requestTypes = ['application/json', 'form-data'];
 const tokenRegex =
@@ -33,22 +33,22 @@ const Webhook = ({
   if (friendlyNameRegex && !friendlyNameRegex.test(friendlyName)) {
     throw new NotificationValidatorError(
       'friendlyName',
-      'Invalid Friendly Name. Must be alphanumeric, Spaces, and underscores only.'
+      'Invalid Friendly Name. Must be alphanumeric, dashes, and underscores only.'
     );
   }
 
   if (showAdditionalHeaders && !isJson(additionalHeaders)) {
     throw new NotificationValidatorError(
       'additionalHeaders',
-      'Invalid Additional Headers'
+      'Invalid Additional Headers Format'
     );
   }
 
   if (!messageTypes.includes(messageType)) {
     throw new NotificationValidatorError('messageType', 'Invalid Message Type');
   }
 
-  if (!tokenRegex.test(token)) {
+  if (!tokenRegex.test(token)) {  
     throw new NotificationValidatorError('token', 'Invalid Webhook URL');
   }
 

test/e2e/monitor/http.test.js

@@ -0,0 +1,65 @@
+import loginDetails from '../setup/fixtures/login.json';
+import monitorDetails from '../setup/fixtures/monitor.json';
+
+describe('Monitor HTTP - Advance', () => {
+  context('create a monitor with basic information', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('should show errors for invalid values and create a monitor with valid values', () => {
+      cy.createMonitor(monitorDetails.http);
+    });
+  });
+
+  context('edit a monitor', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('Edit monitor name', () => {
+      cy.get(`[id="monitor-${monitorDetails.http.name.value}"]`).click();
+
+      cy.get('[id="monitor-edit-button"]').click();
+
+      cy.typeText(monitorDetails.http.name.id, '-Edited');
+
+      cy.get('[id="monitor-create-button"]').click();
+
+      cy.equals(
+        '[id="monitor-view-menu-name"]',
+        `${monitorDetails.http.name.value}-Edited`
+      );
+    });
+  });
+
+  context('delete a monitor', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('Delete monitor', () => {
+      cy.get(`[id="monitor-${monitorDetails.http.name.value}-Edited"]`).click();
+
+      cy.get('[id="monitor-delete-button"]').click();
+
+      cy.get('[id="monitor-delete-confirm-button"]').click();
+
+      cy.get(`[id="monitor-${monitorDetails.http.name.value}-Edited"]`).should(
+        'not.exist'
+      );
+    });
+  });
+});

test/e2e/monitor/tcp.test.js

@@ -0,0 +1,65 @@
+import loginDetails from '../setup/fixtures/login.json';
+import monitorDetails from '../setup/fixtures/monitor.json';
+
+describe('Monitor TCP - Advance', () => {
+  context('create a monitor with basic information', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('should show errors for invalid values and create a monitor with valid values', () => {
+      cy.createMonitor(monitorDetails.tcp);
+    });
+  });
+
+  context('edit a monitor', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('Edit monitor name', () => {
+      cy.get(`[id="monitor-${monitorDetails.tcp.name.value}"]`).click();
+
+      cy.get('[id="monitor-edit-button"]').click();
+
+      cy.typeText(monitorDetails.tcp.name.id, '-Edited');
+
+      cy.get('[id="monitor-create-button"]').click();
+
+      cy.equals(
+        '[id="monitor-view-menu-name"]',
+        `${monitorDetails.tcp.name.value}-Edited`
+      );
+    });
+  });
+
+  context('delete a monitor', () => {
+    beforeEach(() => {
+      const { email, password } = loginDetails.ownerUser;
+
+      cy.clearCookies();
+      cy.loginUser(email, password);
+      cy.visit('/');
+    });
+
+    it('should delete a monitor', () => {
+      cy.get(`[id="monitor-${monitorDetails.tcp.name.value}-Edited"]`).click();
+
+      cy.get('[id="monitor-delete-button"]').click();
+
+      cy.get('[id="monitor-delete-confirm-button"]').click();
+
+      cy.get(`[id="monitor-${monitorDetails.tcp.name.value}-Edited"]`).should(
+        'not.exist'
+      );
+    });
+  });
+});