X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ee9dac4509683f2fbe5fda146bd9c18f4b765337..a0a722d1920abbe1e20190d296be0c51daabefc2:/cypress/support/commands.js

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 8c6fd46293..24e4b73a32 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -32,17 +32,17 @@ const controllerURL = Cypress.env('controller_url');
 const systemToken = Cypress.env('system_token');
 
 Cypress.Commands.add(
-    "do_request", (method='GET', path='', data=null, qs=null,
-                   token=systemToken, auth=false, followRedirect=true) => {
-        return cy.request({
-            method: method,
-            url: `${controllerURL}/${path}`,
-            body: data,
-            qs: auth ? qs : Object.assign({api_token: token}, qs),
-            auth: auth ? {bearer: `${token}`} : undefined,
-            followRedirect: followRedirect
-        })
-    }
+    "doRequest", (method = 'GET', path = '', data = null, qs = null,
+        token = systemToken, auth = false, followRedirect = true) => {
+    return cy.request({
+        method: method,
+        url: `${controllerURL}/${path}`,
+        body: data,
+        qs: auth ? qs : Object.assign({ api_token: token }, qs),
+        auth: auth ? { bearer: `${token}` } : undefined,
+        followRedirect: followRedirect
+    })
+}
 )
 
 // This resets the DB removing all content and seeding it with the fixtures.
@@ -54,9 +54,9 @@ Cypress.Commands.add(
 )
 
 Cypress.Commands.add(
-    "getUser", (username, first_name='', last_name='', is_admin=false, is_active=true) => {
+    "getUser", (username, first_name = '', last_name = '', is_admin = false, is_active = true) => {
         // Create user if not already created
-        return cy.do_request('POST', '/auth/controller/callback', {
+        return cy.doRequest('POST', '/auth/controller/callback', {
             auth_info: JSON.stringify({
                 email: `${username}@example.local`,
                 username: username,
@@ -66,46 +66,113 @@ Cypress.Commands.add(
             }),
             return_to: ',https://example.local'
         }, null, systemToken, true, false) // Don't follow redirects so we can catch the token
-        .its('headers.location').as('location')
-        // Get its token and set the account up as admin and/or active
-        .then(function() {
-            this.userToken = this.location.split("=")[1]
-            assert.isString(this.userToken)
-            return cy.do_request('GET', '/arvados/v1/users', null, {
-                filters: `[["username", "=", "${username}"]]`
-            })
-            .its('body.items.0')
-            .as('aUser')
-            .then(function() {
-                cy.do_request('PUT', `/arvados/v1/users/${this.aUser.uuid}`, {
-                    user: {
-                        is_admin: is_admin,
-                        is_active: is_active
-                    }
-                })
-                .its('body')
-                .as('theUser')
-                .then(function() {
-                    return {user: this.theUser, token: this.userToken};
+            .its('headers.location').as('location')
+            // Get its token and set the account up as admin and/or active
+            .then(function () {
+                this.userToken = this.location.split("=")[1]
+                assert.isString(this.userToken)
+                return cy.doRequest('GET', '/arvados/v1/users', null, {
+                    filters: `[["username", "=", "${username}"]]`
                 })
+                    .its('body.items.0')
+                    .as('aUser')
+                    .then(function () {
+                        cy.doRequest('PUT', `/arvados/v1/users/${this.aUser.uuid}`, {
+                            user: {
+                                is_admin: is_admin,
+                                is_active: is_active
+                            }
+                        })
+                            .its('body')
+                            .as('theUser')
+                            .then(function () {
+                                return { user: this.theUser, token: this.userToken };
+                            })
+                    })
             })
+    }
+)
+
+Cypress.Commands.add(
+    "createLink", (token, data) => {
+        return cy.createResource(token, 'links', {
+            link: JSON.stringify(data)
         })
     }
 )
 
 Cypress.Commands.add(
-    "createCollection", (token, collection) => {
-        return cy.do_request('POST', '/arvados/v1/collections', {
-            collection: JSON.stringify(collection),
+    "createGroup", (token, data) => {
+        return cy.createResource(token, 'groups', {
+            group: JSON.stringify(data),
             ensure_unique_name: true
-        }, null, token, true)
-        .its('body').as('collection')
-        .then(function() {
-            return this.collection;
         })
     }
 )
 
+Cypress.Commands.add(
+    "trashGroup", (token, uuid) => {
+        return cy.deleteResource(token, 'groups', uuid);
+    }
+)
+
+
+Cypress.Commands.add(
+    "createWorkflow", (token, data) => {
+        return cy.createResource(token, 'workflows', {
+            workflow: JSON.stringify(data),
+            ensure_unique_name: true
+        })
+    }
+)
+
+Cypress.Commands.add(
+    "createCollection", (token, data) => {
+        return cy.createResource(token, 'collections', {
+            collection: JSON.stringify(data),
+            ensure_unique_name: true
+        })
+    }
+)
+
+Cypress.Commands.add(
+    "updateCollection", (token, uuid, data) => {
+        return cy.updateResource(token, 'collections', uuid, {
+            collection: JSON.stringify(data)
+        })
+    }
+)
+
+Cypress.Commands.add(
+    "createResource", (token, suffix, data) => {
+        return cy.doRequest('POST', '/arvados/v1/' + suffix, data, null, token, true)
+            .its('body').as('resource')
+            .then(function () {
+                return this.resource;
+            })
+    }
+)
+
+Cypress.Commands.add(
+    "deleteResource", (token, suffix, uuid) => {
+        return cy.doRequest('DELETE', '/arvados/v1/' + suffix + '/' + uuid)
+            .its('body').as('resource')
+            .then(function () {
+                return this.resource;
+            })
+    }
+)
+
+Cypress.Commands.add(
+    "updateResource", (token, suffix, uuid, data) => {
+        return cy.doRequest('PUT', '/arvados/v1/' + suffix + '/' + uuid, data, null, token, true)
+            .its('body').as('resource')
+            .then(function () {
+                return this.resource;
+            })
+    }
+)
+
 Cypress.Commands.add(
     "loginAs", (user) => {
         cy.visit(`/token/?api_token=${user.token}`);
@@ -113,4 +180,20 @@ Cypress.Commands.add(
         cy.get('div#root').should('contain', 'Arvados Workbench (zzzzz)');
         cy.get('div#root').should('not.contain', 'Your account is inactive');
     }
-)
\ No newline at end of file
+)
+
+Cypress.Commands.add(
+    "doSearch", (searchTerm) => {
+        cy.get('[data-cy=searchbar-input-field]').type(`{selectall}${searchTerm}{enter}`);
+    }
+)
+
+Cypress.Commands.add('getAll', (...elements) => {
+    const promise = cy.wrap([], { log: false })
+
+    for (let element of elements) {
+        promise.then(arr => cy.get(element).then(got => cy.wrap([...arr, got])))
+    }
+
+    return promise
+})
\ No newline at end of file