From e966485bfac7293a7336e701e085fc92628c26b0 Mon Sep 17 00:00:00 2001 From: nimya-aot Date: Mon, 27 May 2024 13:42:48 -0700 Subject: [PATCH] updated --- tests/functional/cypress.config.js | 6 +++--- tests/functional/cypress/e2e/about.cy.js | 5 +++-- tests/functional/cypress/support/login.js | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/functional/cypress.config.js b/tests/functional/cypress.config.js index 26eb504e0..8df3b23b1 100644 --- a/tests/functional/cypress.config.js +++ b/tests/functional/cypress.config.js @@ -2,7 +2,7 @@ const { defineConfig } = require('cypress') module.exports = defineConfig({ env: { - depEnv: '', + depEnv: 'app', auth_base_url: 'http://localhost:8082', auth_realm: 'chefs', auth_client_id: 'chefs-frontend', @@ -25,8 +25,8 @@ module.exports = defineConfig({ // return require('./plugins/index.js')(on, config) //baseUrl: 'http://localhost:5173', - //baseUrl:'https://chefs-dev.apps.silver.devops.gov.bc.ca', - baseUrl: process.env.CUSTOM_URL, + baseUrl:'https://chefs-dev.apps.silver.devops.gov.bc.ca', + //baseUrl: process.env.CUSTOM_URL, specPattern: 'cypress/e2e/*.cy.{js,jsx,ts,tsx}', testIsolation: false, diff --git a/tests/functional/cypress/e2e/about.cy.js b/tests/functional/cypress/e2e/about.cy.js index 1cce57844..0c1bfa579 100644 --- a/tests/functional/cypress/e2e/about.cy.js +++ b/tests/functional/cypress/e2e/about.cy.js @@ -6,7 +6,7 @@ const baseUrl = Cypress.env('baseUrl'); describe('Application About Page', () => { it('Visits the app about page', () => { - if(depEnv=="") + if(depEnv=="app") { cy.visit(`https://chefs-dev.apps.silver.devops.gov.bc.ca/app`); @@ -15,7 +15,8 @@ describe('Application About Page', () => { else { - cy.visit(`https://chefs-dev.apps.silver.devops.gov.bc.ca/pr-${depEnv}`); + //cy.visit(`https://chefs-dev.apps.silver.devops.gov.bc.ca/pr-${depEnv}`); + cy.visit(`/pr-${depEnv}`); cy.contains('Create, publish forms, and receive submissions with the Common Hosted Forms Service.').should('be.visible'); } diff --git a/tests/functional/cypress/support/login.js b/tests/functional/cypress/support/login.js index 920049ed0..58f507bdc 100644 --- a/tests/functional/cypress/support/login.js +++ b/tests/functional/cypress/support/login.js @@ -12,7 +12,8 @@ export function formsettings(){ else { - cy.visit(`https://chefs-dev.apps.silver.devops.gov.bc.ca/pr-${depEnv}`); + //cy.visit(`https://chefs-dev.apps.silver.devops.gov.bc.ca/pr-${depEnv}`); + cy.visit(`/pr-${depEnv}`); } cy.get('[data-test="base-auth-btn"] > .v-btn > .v-btn__content > span').click();