dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-22 00:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dbgate/dbgate

Browse Source
This commit is contained in:
Jan Prochazka
2025-03-14 12:09:31 +01:00
parent 41f158dac1 31621f273b
commit 9fa8d98ae8
8 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-app-pro-beta.yaml vendored
View File

@@ -39,7 +39,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-app-pro.yaml vendored
View File

@@ -39,7 +39,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-cloud-pro.yaml vendored
View File

@@ -39,7 +39,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-docker-pro.yaml vendored
View File

@@ -44,7 +44,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/build-npm-pro.yaml vendored
View File

@@ -32,7 +32,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

2
.github/workflows/e2e-pro.yaml vendored
View File

@@ -26,7 +26,7 @@ jobs:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: 21048330597124a88fa1b8447e0bc18666eb69c5 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro

60
e2e-tests/cypress/e2e/portal.cy.js
View File

@@ -45,36 +45,36 @@ describe('Run as portal', () => {
cy.get('[data-testid=InputTextModal_ok]').click(); cy.get('[data-testid=InputTextModal_ok]').click();
}); });
it('Import Chinook MySQL', () => { // it('Import Chinook MySQL', () => {
cy.visit('http://localhost:3000'); // cy.visit('http://localhost:3000');
cy.contains('MySql-connection').click(); // cy.contains('MySql-connection').click();
cy.get('[data-testid=DatabaseAppObject_Chinook]').rightclick(); // cy.get('[data-testid=DatabaseAppObject_Chinook]').rightclick();
cy.contains('Chinook').rightclick(); // cy.contains('Chinook').rightclick();
cy.contains('Restore/import SQL dump').click(); // cy.contains('Restore/import SQL dump').click();
cy.get('#uploadFileButton').selectFile('data/chinook-mysql.sql', { force: true }); // cy.get('#uploadFileButton').selectFile('data/chinook-mysql.sql', { force: true });
cy.wait(500); // cy.wait(500);
cy.get('[data-testid=ImportDatabaseDumpModal_runImport]').click(); // cy.get('[data-testid=ImportDatabaseDumpModal_runImport]').click();
cy.contains('Importing database'); // cy.contains('Importing database');
cy.contains('Finished job script'); // cy.contains('Finished job script');
cy.get('[data-testid=RunScriptModal_close]').click(); // cy.get('[data-testid=RunScriptModal_close]').click();
cy.contains('Chinook').click(); // cy.contains('Chinook').click();
cy.contains('Album'); // cy.contains('Album');
}); // });
it('Import Chinook Postgres', () => { // it('Import Chinook Postgres', () => {
cy.visit('http://localhost:3000'); // cy.visit('http://localhost:3000');
cy.contains('Postgres-connection').click(); // cy.contains('Postgres-connection').click();
cy.get('[data-testid=DatabaseAppObject_Chinook]').rightclick(); // cy.get('[data-testid=DatabaseAppObject_Chinook]').rightclick();
cy.contains('Restore/import SQL dump').click(); // cy.contains('Restore/import SQL dump').click();
cy.get('#uploadFileButton').selectFile('data/chinook-postgres.sql', { force: true }); // cy.get('#uploadFileButton').selectFile('data/chinook-postgres.sql', { force: true });
cy.wait(500); // cy.wait(500);
cy.get('[data-testid=ImportDatabaseDumpModal_runImport]').click(); // cy.get('[data-testid=ImportDatabaseDumpModal_runImport]').click();
cy.contains('Importing database'); // cy.contains('Importing database');
cy.contains('Finished job script'); // cy.contains('Finished job script');
cy.get('[data-testid=RunScriptModal_close]').click(); // cy.get('[data-testid=RunScriptModal_close]').click();
cy.contains('Chinook').click(); // cy.contains('Chinook').click();
cy.contains('album'); // cy.contains('album');
}); // });
it('Open ask pwd connection', () => { it('Open ask pwd connection', () => {
cy.visit('http://localhost:3000'); cy.visit('http://localhost:3000');
@@ -83,7 +83,7 @@ describe('Run as portal', () => {
cy.testid('DatabaseLoginModal_password').clear().type('Pwd2020Db'); cy.testid('DatabaseLoginModal_password').clear().type('Pwd2020Db');
cy.testid('DatabaseLoginModal_connect').click(); cy.testid('DatabaseLoginModal_connect').click();
cy.contains('Chinook').click(); cy.contains('Chinook').click();
cy.contains('album'); // cy.contains('album');
}); });
// it('import chinook DB', () => { // it('import chinook DB', () => {

2
workflow-templates/includes.tpl.yaml
View File

@@ -7,7 +7,7 @@ checkout-and-merge-pro:
repository: dbgate/dbgate-pro repository: dbgate/dbgate-pro
token: ${{ secrets.GH_TOKEN }} token: ${{ secrets.GH_TOKEN }}
path: dbgate-pro path: dbgate-pro
ref: fe2df73e3914cd19a46a8a0ab50b5df58ef979e7 ref: 3782e471a8fa999d56b6be20f7fc3cb922e2368b
- name: Merge dbgate/dbgate-pro - name: Merge dbgate/dbgate-pro
run: | run: |
mkdir ../dbgate-pro mkdir ../dbgate-pro