From 595bc348cd489924d136103bb0d37358cf4eed0b Mon Sep 17 00:00:00 2001 From: k3yi0 Date: Fri, 29 Apr 2022 10:12:31 +0200 Subject: [PATCH] chore: ping OAuth2 Server and log the outcome, change user test to Test --- .github/workflows/chronograf-cypress-tests.yaml | 3 ++- ui/cypress/integration/chronografAdmin.test.ts | 2 +- ui/cypress/integration/dashboard.test.ts | 2 +- ui/cypress/integration/queryBuilder.test.ts | 2 +- ui/cypress/integration/welcome.test.ts | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml index 8c423e032..244ecf9f6 100644 --- a/.github/workflows/chronograf-cypress-tests.yaml +++ b/.github/workflows/chronograf-cypress-tests.yaml @@ -69,7 +69,7 @@ jobs: env: OAUTH2_HOSTNAME: 172.17.0.1 OAUTH2_PORT: 8087 - OAUTH2_TEST_USER_NAME: Test User + OAUTH2_TEST_USER_NAME: test OAUTH2_TEST_USER_EMAIL: test@oauth2.mock OAUTH2_REDIRECT_URL: http://host.docker.internal:8888/oauth/oauth-mock/callback @@ -97,6 +97,7 @@ jobs: run: | echo "InfluxDB data node status: $(curl -Isk "https://localhost:8086/ping" | head -n 1)" echo "Chronograf status: $(curl -Isk "http://localhost:8888" | head -n 1)" + echo "OAuth2 Server status: $(curl -Isk "http://172.17.0.1:8087" | head -n 1)" cat out.log || true - name: Cypress diff --git a/ui/cypress/integration/chronografAdmin.test.ts b/ui/cypress/integration/chronografAdmin.test.ts index f4022bbac..ca57f8ab1 100644 --- a/ui/cypress/integration/chronografAdmin.test.ts +++ b/ui/cypress/integration/chronografAdmin.test.ts @@ -1,6 +1,6 @@ describe('Use Admin tab', () => { beforeEach(() => { - cy.OAuthLogin('test') + cy.OAuthLogin('Test') cy.visit('/login') cy.removeConnections() cy.createConnection() diff --git a/ui/cypress/integration/dashboard.test.ts b/ui/cypress/integration/dashboard.test.ts index 30bc69846..7ad34749c 100644 --- a/ui/cypress/integration/dashboard.test.ts +++ b/ui/cypress/integration/dashboard.test.ts @@ -1,6 +1,6 @@ describe('Use Dashboards', () => { beforeEach(() => { - cy.OAuthLogin('test') + cy.OAuthLogin('Test') cy.visit('/login') cy.removeConnections() cy.createConnection() diff --git a/ui/cypress/integration/queryBuilder.test.ts b/ui/cypress/integration/queryBuilder.test.ts index 8219b03ff..2dc6c60d9 100644 --- a/ui/cypress/integration/queryBuilder.test.ts +++ b/ui/cypress/integration/queryBuilder.test.ts @@ -1,6 +1,6 @@ describe('query builder', () => { beforeEach(() => { - cy.OAuthLogin('test') + cy.OAuthLogin('Test') cy.deleteDashboards() cy.removeConnections() cy.createConnection() diff --git a/ui/cypress/integration/welcome.test.ts b/ui/cypress/integration/welcome.test.ts index 682f0d9c6..68e814c4b 100644 --- a/ui/cypress/integration/welcome.test.ts +++ b/ui/cypress/integration/welcome.test.ts @@ -1,8 +1,9 @@ describe('Welcome Page', () => { beforeEach(() => { - cy.OAuthLogin('test') + cy.OAuthLogin('Test') cy.removeConnections() cy.OAuthLogout() + console.log(window.location.hostname) }) it('set up InfluxDB connection', () => {