SS-606, SS-534 - adjust default flavor, make two project templates

cypress/e2e/ui-tests/test-homepage.cy.js

@@ -7,7 +7,7 @@ describe("Test of the home page", () => {
 
     it("should open the home page on link click", () => {
         cy.get("li.nav-item a").contains("Home").click()
-        cy.url().should("include", "")
+        cy.url().should("include", "/home")
     })
 
     it("should open the Apps page on link click", () => {

cypress/e2e/ui-tests/test-project-as-contributor.cy.js

@@ -30,7 +30,7 @@ describe("Test project contributor user functionality", () => {
     it("can run the test setup", () => {
     })
 
-    it("can create a new blank project, open settings, delete from settings", () => {
+    it("can create a new project with default template, open settings, delete from settings", () => {
 
         // Names of objects to create
         const project_name = "e2e-create-proj-test"
@@ -54,12 +54,83 @@ describe("Test project contributor user functionality", () => {
         cy.get('input[name=name]').type(project_name)
         cy.get('textarea[name=description]').type("A test project created by an e2e test.")
         cy.get("input[name=save]").contains('Create project').click()
+        cy.wait(5000) // sometimes it takes a while to create a project
             .then((href) => {
                 cy.log(href)
                 //cy.url().should("include", "/project-e2e-blank");
                 cy.get("title").should("have.text", project_title_name)
                 cy.get('h3').should('contain', project_name)
 
+                // Check that the correct deployment options are available
+                cy.get('.card-header').find('h5').should('contain', 'Develop')
+                cy.get('.card-header').find('h5').should('contain', 'Serve')
+                cy.get('.card-header').find('h5').should('not.contain', 'Models')
+                cy.get('.card-header').find('h5').should('not.contain', 'Additional options [admins only]')
+
+                // Check that project settings are available
+                cy.get('[data-cy="settings"]').click()
+                cy.url().should("include", "settings")
+                cy.get('h3').should('contain', 'Project settings')
+
+                // Check that the correct project settings are visible (i.e. no extra settings)
+                cy.get('.list-group').find('a').should('contain', 'Access')
+                cy.get('.list-group').find('a').should('not.contain', 'S3 storage')
+                cy.get('.list-group').find('a').should('not.contain', 'MLFlow')
+                cy.get('.list-group').find('a').should('not.contain', 'Flavors')
+                cy.get('.list-group').find('a').should('not.contain', 'Environments')
+
+                // Delete the project from the settings menu
+                cy.get('a').contains("Delete").click()
+                .then((href) => {
+                    cy.get('div#delete').should('have.css', 'display', 'block')
+                    cy.get('#id_delete_button').parent().parent().find('button').contains('Delete').click()
+                    .then((href) => {
+                        cy.get('div#deleteModal').should('have.css', 'display', 'block')
+                        cy.get('div#deleteModal').find('button').contains('Confirm').click()
+                    })
+                    cy.contains(project_name).should('not.exist')
+
+                   })
+            })
+    })
+
+    it("can create a new project with ML serving template, open settings, delete from settings", () => {
+
+        // Names of objects to create
+        const project_name = "e2e-create-proj-test"
+        const volume_name = "e2e-project-vol"
+        const project_title_name = project_name + " | SciLifeLab Serve"
+
+        cy.visit("/projects/")
+        cy.get("title").should("have.text", "My projects | SciLifeLab Serve")
+
+        // Click button for UI to create a new project
+        cy.get("a").contains('New project').click()
+        cy.url().should("include", "projects/templates")
+        cy.get('h3').should('contain', 'New project')
+
+        // Next click button to create a new blank project
+        cy.get(".card-body").last().contains("Create").click()
+        cy.url().should("include", "projects/create?template=")
+        cy.get('h3').should('contain', 'New project')
+
+        // Fill in the options for creating a new blank project
+        cy.get('input[name=name]').type(project_name)
+        cy.get('textarea[name=description]').type("A test project created by an e2e test.")
+        cy.get("input[name=save]").contains('Create project').click()
+        cy.wait(5000) // sometimes it takes a while to create a project
+        .then((href) => {
+                cy.log(href)
+                //cy.url().should("include", "/project-e2e-blank");
+                cy.get("title").should("have.text", project_title_name)
+                cy.get('h3').should('contain', project_name)
+
+                // Check that the correct deployment options are available
+                cy.get('.card-header').find('h5').should('contain', 'Develop')
+                cy.get('.card-header').find('h5').should('contain', 'Serve')
+                cy.get('.card-header').find('h5').should('contain', 'Models')
+                cy.get('.card-header').find('h5').should('not.contain', 'Additional options [admins only]')
+
                 // Section Models - Machine Learning Models
                 // Navigate to the create models view and cancel back again
                 cy.get("div#models").first("h5").should("contain", "Machine Learning Models")
@@ -73,13 +144,6 @@ describe("Test project contributor user functionality", () => {
                         })
                     })
 
-                // Check that the correct deployment options are available
-                cy.get('.card-header').find('h5').should('contain', 'Develop')
-                cy.get('.card-header').find('h5').should('contain', 'Serve')
-                cy.get('.card-header').find('h5').should('contain', 'Models')
-                cy.get('.card-header').find('h5').should('not.contain', 'Network')
-                cy.get('.card-header').find('h5').should('not.contain', 'Store')
-
                 // Check that project settings are available
                 cy.get('[data-cy="settings"]').click()
                 cy.url().should("include", "settings")
@@ -148,6 +212,7 @@ describe("Test project contributor user functionality", () => {
         cy.get("a").contains('Create').first().click()
         cy.get('input[name=name]').type(project_name)
         cy.get("input[name=save]").contains('Create project').click()
+        cy.wait(5000) // sometimes it takes a while to create a project
             .then((href) => {
                 cy.log(href)
                 // Check that the app limits work using Jupyter Lab as example
@@ -191,6 +256,7 @@ describe("Test project contributor user functionality", () => {
             cy.get('input[name=name]').type(project_name)
             cy.get("input[name=save]").contains('Create project').click()
         });
+        cy.wait(5000) // sometimes it takes a while to create a project but just waiting once at the end should be enough
 
         // Now check that it is not possible to create another project
         // not possible to click the button to create a new project

cypress/support/commands.js

@@ -98,5 +98,26 @@ Cypress.Commands.add('createBlankProject', (project_name) => {
   cy.get('input[name=name]').type(project_name)
   cy.get('textarea[name=description]').type("A test project created by an e2e test.")
   cy.get("input[name=save]").contains('Create project').click()
-
-})
+  cy.wait(5000) // need to wait a bit for the project to be created on some machines, otherwise won't find the new project under /projects/
+
+})
+
+Cypress.Commands.add('deleteBlankProject', (project_name) => {
+
+  cy.visit("/projects/")
+
+  cy.get('h5.card-title').contains(project_name).siblings('div').find('a.confirm-delete').click()
+  .then((href) => {
+      cy.get('div#modalConfirmDelete').should('have.css', 'display', 'block')
+
+      cy.get("h1#modalConfirmDeleteLabel").then(function($elem) {
+          cy.log($elem.text())
+
+          cy.get('div#modalConfirmDeleteFooter').find('button').contains('Delete').click()
+
+          // Assert that the project has been deleted
+          cy.contains(project_name).should('not.exist')
+     })
+  })
+
+})

fixtures/appcats_fixtures.json

@@ -1,37 +1,23 @@
 [
   {
+    "fields": {
+      "name": "Develop"
+    },
     "model": "apps.appcategories",
-    "pk": "network",
+    "pk": "develop"
+  },
+  {
     "fields": {
-      "name": "Network"
-    }
+      "name": "Serve"
+    },
+    "model": "apps.appcategories",
+    "pk": "serve"
   },
-{
-  "model": "apps.appcategories",
-  "pk": "compute",
-  "fields": {
-    "name": "Notebooks"
-  }
-},
-{
-  "model": "apps.appcategories",
-  "pk": "develop",
-  "fields": {
-    "name": "Develop"
-  }
-},
-{
-  "model": "apps.appcategories",
-  "pk": "serve",
-  "fields": {
-    "name": "Serve"
-  }
-},
-{
-  "model": "apps.appcategories",
-  "pk": "store",
-  "fields": {
-    "name": "Store"
+  {
+    "fields": {
+      "name": "Additional options [admins only]"
+    },
+    "model": "apps.appcategories",
+    "pk": "admin-apps"
   }
-}
 ]