Cypress: Tests in relevant spec category (#2225)

cypress/e2e/Layout/users.cy.js → cypress/e2e/Administration/users.cy.js

@@ -49,14 +49,23 @@ describe('Users', function() {
     cy.get('.modal input#password')
       .type('cypress');
 
+    // Error checking - for incorrect email format
+    cy.get('.modal input#email').type('cypress');
+
     cy.get('.select2-container--bootstrap').eq(1).click();
     cy.log('Before waiting for Icon Dashboard element');
     cy.wait('@loadHomepageAfterSearch');
     cy.get('.select2-results__option')
       .should('contain', 'Icon Dashboard')
       .click();
 
-    // Add first by clicking next
+    // Try saving
+    cy.get('.modal .save-button').click();
+
+    cy.contains('Please enter a valid email address.');
+    cy.get('.modal input#email').clear().type('[email protected]');
+
+    // Save
     cy.get('.modal .save-button').click();
 
     // Check if user is added in toast message
@@ -94,6 +103,17 @@ describe('Users', function() {
       cy.get('.modal input#userName').clear()
         .type('CypressTestUserEdited' + testRun);
 
+      cy.get('.modal input#newPassword').clear().type('newPassword');
+      cy.get('.modal input#retypeNewPassword').clear().type('wrongPassword');
+
+      // edit test user
+      cy.get('.bootbox .save-button').click();
+      cy.wait('@putRequest')
+
+      // Error checking - for password mismatch
+      cy.contains('Passwords do not match');
+      cy.get('.modal input#retypeNewPassword').clear().type('newPassword');
+
       // edit test user
       cy.get('.bootbox .save-button').click();
 

cypress/e2e/Display/displaygroups.cy.js

@@ -296,4 +296,24 @@ describe('Display Groups', function() {
       cy.get('.modal-body').contains(': Success');
     });
   });
+
+  // ---------
+  // Tests - Error handling
+  it('should not add a displaygroup without dynamic criteria', function() {
+    cy.visit('/displaygroup/view');
+
+    // Click on the Add Displaygroup button
+    cy.contains('Add Display Group').click();
+
+    cy.get('.modal input#displayGroup')
+        .type('Cypress Test Displaygroup ' + testRun + '_1');
+
+    cy.get('.modal input#isDynamic').check();
+
+    // Add first by clicking next
+    cy.get('.modal .save-button').click();
+
+    // Check toast message
+    cy.contains('Dynamic Display Groups must have at least one Criteria specified.');
+  });
 });

cypress/e2e/displays.cy.js → cypress/e2e/Display/displays.cy.js

@@ -113,7 +113,7 @@ describe('Displays', function() {
   });
 
   // Display: disp3
-  it.only('searches and authorise an unauthorised display', function() {
+  it('searches and authorise an unauthorised display', function() {
     // search for a display disp1 and edit
     cy.intercept({
       url: '/display?*',
@@ -275,4 +275,52 @@ describe('Displays', function() {
 
     cy.get('#displays_wrapper.dataTables_wrapper').should('be.visible');
   });
+
+  // ---------
+  // Tests - Error handling
+  it.only('should not be able to save while editing existing display with incorrect latitude/longitude', function() {
+    // search for a display disp1 and edit
+    cy.intercept({
+      url: '/display?*',
+      query: {display: 'dis_disp1'},
+    }).as('loadGridAfterSearch');
+
+    // Intercept the PUT request
+    cy.intercept({
+      method: 'PUT',
+      url: '/display/*',
+    }).as('putRequest');
+
+    cy.visit('/display/view');
+
+    // Filter for the created display
+    cy.get('#Filter input[name="display"]')
+        .type('dis_disp1');
+
+    // Wait for the grid reload
+    cy.wait('@loadGridAfterSearch');
+    cy.get('#displays tbody tr').should('have.length', 1);
+
+    // Click on the first row element to open the delete modal
+    cy.get('#displays tr:first-child .dropdown-toggle').click({force: true});
+    cy.get('#displays tr:first-child .display_button_edit').click({force: true});
+    cy.contains('Details').click();
+
+    cy.get('.modal input#latitude').type('1234');
+
+    // edit test display
+    cy.get('.bootbox .save-button').click();
+
+    // Check error message
+    cy.contains('The latitude entered is not valid.');
+
+    cy.get('.modal input#latitude').clear();
+    cy.get('.modal input#longitude').type('1234');
+
+    // edit test display
+    cy.get('.bootbox .save-button').click();
+
+    // Check error message
+    cy.contains('The longitude entered is not valid.');
+  });
 });

cypress/e2e/Display/syncgroups.cy.js

@@ -36,16 +36,15 @@ describe('Sync Groups', function() {
     cy.contains('Add Sync Group').click();
 
     cy.get('.modal input#name')
-      .type('Cypress Test Sync Group ' + testRun + '_1');
+      .type('Cypress Test Sync Group ' + testRun);
 
     // Add first by clicking next
     cy.get('.modal .save-button').click();
 
     // Check if syncgroup is added in toast message
-    cy.contains('Added Cypress Test Sync Group ' + testRun + '_1');
+    cy.contains('Added Cypress Test Sync Group ' + testRun);
   });
 
-
   it('searches and delete existing syncgroup', function() {
     // Create a new syncgroup and then search for it and delete it
     cy.createSyncGroup('Cypress Test Sync Group ' + testRun).then((res) => {
@@ -75,4 +74,24 @@ describe('Sync Groups', function() {
       cy.get('.toast').contains('Deleted Cypress Test Sync Group');
     });
   });
+
+  // ---------
+  // Tests - Error handling
+  it.only('should not add a syncgroup without publisher port', function() {
+    cy.visit('/syncgroup/view');
+
+    // Click on the Add Sync Group button
+    cy.contains('Add Sync Group').click();
+
+    cy.get('.modal input#name')
+        .type('Cypress Test Sync Group ' + testRun);
+
+    cy.get('#syncPublisherPort').clear();
+
+    // Add first by clicking next
+    cy.get('.modal .save-button').click();
+
+    // Check if syncgroup is added in toast message
+    cy.contains('Sync Publisher Port cannot be empty');
+  });
 });

cypress/e2e/Display/datasets.cy.js → cypress/e2e/Library/datasets.cy.js

@@ -182,7 +182,6 @@ describe('Datasets', function() {
     });
   });
 
-
   it('copy an existing dataset', function() {
     // Create a new dataset and then search for it and copy it
     cy.createDataset('Cypress Test Dataset ' + testRun).then((res) => {
@@ -283,4 +282,24 @@ describe('Datasets', function() {
       cy.get('.modal-body').contains(': Success');
     });
   });
+
+  // ---------
+  // Tests - Error handling
+  it('should not add a remote dataset without URI', function() {
+    cy.visit('/dataset/view');
+
+    // Click on the Add Dataset button
+    cy.contains('Add DataSet').click();
+
+    cy.get('.modal input#dataSet')
+        .type('Cypress Test Dataset ' + testRun);
+
+    cy.get('.modal input#isRemote').check();
+
+    // Add first by clicking next
+    cy.get('.modal .save-button').click();
+
+    // Check error message
+    cy.contains('A remote DataSet must have a URI.');
+  });
 });

modules/templates/article-static.xml

@@ -23,7 +23,6 @@
         <id>article_custom_html</id>
         <type>static</type>
         <dataType>article</dataType>
-        <showIn>none</showIn>
         <title>Articles shown with custom HTML</title>
         <properties>
             <property id="customTemplate" type="hidden">