From 34f8b3f312d010312cf48467438b6f8f0d96eb25 Mon Sep 17 00:00:00 2001 From: Gregory Rushton Date: Thu, 29 Sep 2022 10:53:16 -0400 Subject: [PATCH] [DUOS-2114][risk=no] Move from perf to alpha env for testing (#1818) * perf -> alpha --- .github/workflows/integration-tests.yml | 2 +- TESTING.md | 2 +- config/{perf.json => alpha.json} | 17 +++++++---------- cypress/component/SignIn/sign_in.spec.js | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) rename config/{perf.json => alpha.json} (61%) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index ee43ac7d3..85e790a8a 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -12,7 +12,7 @@ jobs: - name: NPM Install run: npm ci - name: Copy Configs - run: cp config/perf.json public/config.json + run: cp config/alpha.json public/config.json - name: NPM Build run: CI=false npm run build --silent - name: Cypress run integration tests diff --git a/TESTING.md b/TESTING.md index 31879ad60..4db76fca6 100644 --- a/TESTING.md +++ b/TESTING.md @@ -3,7 +3,7 @@ We use [Cypress](https://docs.cypress.io/) for testing. Update an environment config file to test against: ``` -cp config/perf.json public/config.json +cp config/alpha.json public/config.json ``` ## Run All Tests diff --git a/config/perf.json b/config/alpha.json similarity index 61% rename from config/perf.json rename to config/alpha.json index e03dbd056..27cfe3877 100644 --- a/config/perf.json +++ b/config/alpha.json @@ -1,18 +1,15 @@ { "Comments": "The values in this configuration are all publicly accessible values from the deployed application.", - "env": "perf", - "tag": "perf", - "hash": "perf", - "apiUrl": "https://consent.dsde-perf.broadinstitute.org", - "ontologyApiUrl": "https://consent-ontology.dsde-perf.broadinstitute.org/", - "clientId": "635957978953-tklh1h40e25juilm8j77uujsnucp4sk5.apps.googleusercontent.com", + "env": "alpha", + "tag": "alpha", + "hash": "alpha", + "apiUrl": "https://consent.dsde-alpha.broadinstitute.org", + "ontologyApiUrl": "https://consent-ontology.dsde-alpha.broadinstitute.org/", + "clientId": "1020846292598-hd801vsmmbhh97vaf6aar17lu0q2evfj.apps.googleusercontent.com", "errorApiKey": "1234567890abcdefghijklmnop", "gaId": "", - "gwasUrl": "", "profileUrl": "https://profile-dot-broad-shibboleth-prod.appspot.com/dev", "nihUrl": "https://broad-shibboleth-prod.appspot.com/dev/login", "powerBiUrl": "https://app.powerbi.com/view?r=eyJrIjoiMjI2YjdmZGEtMmRiNC00YjVjLWJjNjktNmI4NmNlYjAxOGY3IiwidCI6IjBjYjdhNjQwLTQ1YTItNGVkNi1iZTlmLTYzNTE5Zjg2ZTA0YiIsImMiOjN9&pageName=ReportSectionc1c4107ccd69e2852e18", - "features": { - "newChairConsole": true - } + "features": {} } diff --git a/cypress/component/SignIn/sign_in.spec.js b/cypress/component/SignIn/sign_in.spec.js index 0acc06892..37f07d595 100644 --- a/cypress/component/SignIn/sign_in.spec.js +++ b/cypress/component/SignIn/sign_in.spec.js @@ -14,7 +14,7 @@ describe('Sign In Component', function() { it('Sign In Button Loads when client id is valid', function () { cy.viewport(600, 300); // Load the client id from perf so we can have a valid button - cy.readFile('config/perf.json').then((config) => { + cy.readFile('config/alpha.json').then((config) => { const clientId = config.clientId; cy.stub(Config, 'getGoogleClientId').returns(clientId); mount();