Skip to content

Commit 8b6481c

Browse files
Merge remote-tracking branch 'origin/main' into feature/RI-6265_update-list-of-databases
2 parents a19c75f + c03f9e4 commit 8b6481c

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/tests-e2e-appimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535

3636
jobs:
3737
e2e-tests-appimage:
38-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-22.04
3939
name: E2E AppImage tests
4040
environment:
4141
name: production

tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { rte } from '../../../../helpers/constants';
2-
import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
2+
import { BrowserPage, ClusterDetailsPage, MyRedisDatabasePage } from '../../../../pageObjects';
33
import { commonUrl, ossClusterForSSHConfig, ossStandaloneForSSHConfig } from '../../../../helpers/conf';
44
import { DatabaseHelper } from '../../../../helpers/database';
55
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
@@ -9,6 +9,7 @@ import { BrowserActions } from '../../../../common-actions/browser-actions';
99

1010
const myRedisDatabasePage = new MyRedisDatabasePage();
1111
const browserPage = new BrowserPage();
12+
const clusterPage = new ClusterDetailsPage();
1213
const databaseHelper = new DatabaseHelper();
1314
const databaseAPIRequests = new DatabaseAPIRequests();
1415
const browserActions = new BrowserActions();
@@ -121,13 +122,21 @@ test('Adding database with SSH', async t => {
121122
await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
122123
await Common.checkURLContainsText('browser');
123124
});
124-
test('Adding OSS Cluster database with SSH', async t => {
125+
test('Verify that OSS Cluster database with SSH can be added and work correctly', async t => {
125126
const sshWithPass = {
126127
...sshParams,
127128
sshPassword: 'pass'
128129
};
129130
// Verify that user can add SSH tunnel with Password for OSS Cluster database
130131
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
131132
await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
132-
await Common.checkURLContainsText('browser');
133+
134+
//verify that db is added and profiler works
135+
await t.click(browserPage.Profiler.expandMonitor);
136+
await t.click(browserPage.Profiler.startMonitorButton);
137+
await t.expect(browserPage.Profiler.monitorIsStartedText.innerText).eql('Profiler is started.');
138+
139+
await t.click(browserPage.NavigationPanel.analysisPageButton);
140+
await t.click(clusterPage.overviewTab);
141+
await t.expect(await clusterPage.getPrimaryNodesCount()).eql(Number('3'), 'Primary nodes in table are not corrected');
133142
});

0 commit comments

Comments
 (0)