From 969876e87b265daf094aade565df89d4c4637ed3 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 4 Feb 2025 12:55:30 +0100 Subject: [PATCH] fix --- .github/workflows/e2e-pro.yaml | 2 +- e2e-tests/cypress/e2e/add-connection.cy.js | 2 +- e2e-tests/cypress/e2e/team.cy.js | 11 ++++++++++- e2e-tests/docker-compose.yaml | 2 +- workflow-templates/e2e-pro.yaml | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-pro.yaml b/.github/workflows/e2e-pro.yaml index a26365e00..f96ce215b 100644 --- a/.github/workflows/e2e-pro.yaml +++ b/.github/workflows/e2e-pro.yaml @@ -84,7 +84,7 @@ jobs: mysql-ssh-login: image: 'ghcr.io/dbgate/mysql-ssh-login:latest' ports: - - '16006:22' + - '16012:22' mysql-ssh-keyfile: image: 'ghcr.io/dbgate/mysql-ssh-keyfile:latest' ports: diff --git a/e2e-tests/cypress/e2e/add-connection.cy.js b/e2e-tests/cypress/e2e/add-connection.cy.js index 69fb1b96b..3b71770fb 100644 --- a/e2e-tests/cypress/e2e/add-connection.cy.js +++ b/e2e-tests/cypress/e2e/add-connection.cy.js @@ -47,7 +47,7 @@ describe('Add connection', () => { cy.get('[data-testid=ConnectionSshTunnelFields_useSshTunnel]').check(); cy.get('[data-testid=ConnectionSshTunnelFields_sshLogin]').clear().type('root'); cy.get('[data-testid=ConnectionSshTunnelFields_sshPassword]').clear().type('root'); - cy.get('[data-testid=ConnectionSshTunnelFields_sshPort]').clear().type('16006'); + cy.get('[data-testid=ConnectionSshTunnelFields_sshPort]').clear().type('16012'); cy.get('[data-testid=ConnectionTab_buttonSave]').click(); cy.get('[data-testid=ConnectionTab_buttonConnect]').click(); cy.contains('performance_schema'); diff --git a/e2e-tests/cypress/e2e/team.cy.js b/e2e-tests/cypress/e2e/team.cy.js index f60d7c597..0e0eca116 100644 --- a/e2e-tests/cypress/e2e/team.cy.js +++ b/e2e-tests/cypress/e2e/team.cy.js @@ -4,7 +4,7 @@ beforeEach(() => { }); describe('Team edition tests', () => { - it('Data archive editor - macros', () => { + it('Team edition screens', () => { cy.testid('LoginPage_linkAdmin').click(); cy.testid('LoginPage_password').type('adminpwd'); cy.testid('LoginPage_submitLogin').click(); @@ -27,4 +27,13 @@ describe('Team edition tests', () => { cy.contains('OAuth 2.0').click(); cy.themeshot('authadmin'); }); + + // it('OAuth authentication', () => { + // cy.testid('AdminMenuWidget_itemAuthentication').click(); + // cy.contains('Add authentication').click(); + // cy.contains('Use database login').click(); + // cy.contains('Add authentication').click(); + // cy.contains('OAuth 2.0').click(); + // cy.themeshot('authadmin'); + // }); }); diff --git a/e2e-tests/docker-compose.yaml b/e2e-tests/docker-compose.yaml index 8bc848bc4..63b4c2ee1 100644 --- a/e2e-tests/docker-compose.yaml +++ b/e2e-tests/docker-compose.yaml @@ -22,7 +22,7 @@ services: restart: always ports: - 16005:3306 - - "16006:22" + - "16012:22" mysql-ssh-keyfile: build: containers/mysql-ssh-keyfile diff --git a/workflow-templates/e2e-pro.yaml b/workflow-templates/e2e-pro.yaml index d3a229995..1c27c4e45 100644 --- a/workflow-templates/e2e-pro.yaml +++ b/workflow-templates/e2e-pro.yaml @@ -84,7 +84,7 @@ jobs: mysql-ssh-login: image: ghcr.io/dbgate/mysql-ssh-login:latest ports: - - '16006:22' + - '16012:22' mysql-ssh-keyfile: image: ghcr.io/dbgate/mysql-ssh-keyfile:latest