diff --git a/database/src/migrations/20211129180001_security_rule update.ts b/database/src/migrations/20211129180001_security_rule update.ts new file mode 100644 index 0000000000..9e56a3af2c --- /dev/null +++ b/database/src/migrations/20211129180001_security_rule update.ts @@ -0,0 +1,22 @@ +import * as Knex from 'knex'; + +const DB_SCHEMA = process.env.DB_SCHEMA; + +export async function up(knex: Knex): Promise { + await knex.raw(` + + set schema '${DB_SCHEMA}'; + set search_path = ${DB_SCHEMA},public; + + ALTER TABLE security_rule ADD COLUMN user_groups json; + + `); +} + +export async function down(knex: Knex): Promise { + await knex.raw(` + + ALTER TABLE security_rule DROP COLUMN user_groups; + + `); +} diff --git a/testing/e2e/cypress.json b/testing/e2e/cypress.json index 98f8d64131..bb61e4dfd7 100644 --- a/testing/e2e/cypress.json +++ b/testing/e2e/cypress.json @@ -10,5 +10,6 @@ "experimentalStudio": true, "viewportHeight": 900, "viewportWidth": 1440, - "baseUrl": "http://localhost:7100" + "OldbaseUrl": "http://localhost:7100", + "baseUrl":"https://dev-biohubbc.apps.silver.devops.gov.bc.ca" } diff --git a/testing/e2e/cypress/integration/smoke_1_CreateProjectMinimal.spec.ts b/testing/e2e/cypress/integration/smoke_1_CreateProjectMinimal.spec.ts index 435b4d870a..8eb777bc79 100644 --- a/testing/e2e/cypress/integration/smoke_1_CreateProjectMinimal.spec.ts +++ b/testing/e2e/cypress/integration/smoke_1_CreateProjectMinimal.spec.ts @@ -66,6 +66,7 @@ while (n < 1) { add_partnerships(); submit_project(); + cy.wait(10000); publish_project(); diff --git a/testing/e2e/cypress/page-functions/project/project-create-page.ts b/testing/e2e/cypress/page-functions/project/project-create-page.ts index 37ca7a53e9..9688dfdbce 100644 --- a/testing/e2e/cypress/page-functions/project/project-create-page.ts +++ b/testing/e2e/cypress/page-functions/project/project-create-page.ts @@ -239,7 +239,7 @@ export function publish_project() { .contains("Publish") .should("be.visible"); cy.get('button[data-testid="publish-project-button"]').click(); - cy.wait(2000); + cy.wait(10000); cy.get('button[data-testid="publish-project-button"]') .contains("Unpublish") .should("be.visible"); diff --git a/testing/e2e/package-lock.json b/testing/e2e/package-lock.json index 64730a1380..fb30f751c1 100644 --- a/testing/e2e/package-lock.json +++ b/testing/e2e/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@babel/core": "^7.5.4", "@types/node": "^14.0.13", - "cypress": "^9.0.0", + "cypress": "^9.1.0", "cypress-file-upload": "^5.0.8", "eslint": "^8.0.1", "eslint-config-airbnb-base": "^14.1.0", @@ -990,9 +990,9 @@ } }, "node_modules/cypress": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.0.0.tgz", - "integrity": "sha512-/93SWBZTw7BjFZ+I9S8SqkFYZx7VhedDjTtRBmXO0VzTeDbmxgK/snMJm/VFjrqk/caWbI+XY4Qr80myDMQvYg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.0.tgz", + "integrity": "sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1004,7 +1004,7 @@ "@types/sizzle": "^2.3.2", "arch": "^2.2.0", "blob-util": "^2.0.2", - "bluebird": "^3.7.2", + "bluebird": "3.7.2", "cachedir": "^2.3.0", "chalk": "^4.1.0", "check-more-types": "^2.24.0", @@ -4679,9 +4679,9 @@ } }, "cypress": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.0.0.tgz", - "integrity": "sha512-/93SWBZTw7BjFZ+I9S8SqkFYZx7VhedDjTtRBmXO0VzTeDbmxgK/snMJm/VFjrqk/caWbI+XY4Qr80myDMQvYg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-9.1.0.tgz", + "integrity": "sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==", "dev": true, "requires": { "@cypress/request": "^2.88.7", @@ -4691,7 +4691,7 @@ "@types/sizzle": "^2.3.2", "arch": "^2.2.0", "blob-util": "^2.0.2", - "bluebird": "^3.7.2", + "bluebird": "3.7.2", "cachedir": "^2.3.0", "chalk": "^4.1.0", "check-more-types": "^2.24.0", diff --git a/testing/e2e/package.json b/testing/e2e/package.json index e376f436b9..d11f139535 100644 --- a/testing/e2e/package.json +++ b/testing/e2e/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@babel/core": "^7.5.4", "@types/node": "^14.0.13", - "cypress": "^9.0.0", + "cypress": "^9.1.0", "cypress-file-upload": "^5.0.8", "eslint": "^8.0.1", "eslint-config-airbnb-base": "^14.1.0",