Skip to content

Commit 44276a3

Browse files
committed
updates for tests
1 parent d0f2f05 commit 44276a3

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

tests/e2e/helpers/conf.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ export const ossSentinelConfig = {
4545
alias: 'primary-group-1',
4646
db: '0',
4747
name: 'primary-group-1',
48-
password: 'password'
48+
password: 'defaultpass'
4949
},
5050
{
5151
alias: 'primary-group-2',
5252
db: '0',
5353
name: 'primary-group-2',
54-
password: 'password'
54+
password: 'defaultpass'
5555
}],
5656
name: ['primary-group-1', 'primary-group-2']
5757
};

tests/e2e/tests/critical-path/database-overview/database-index.e2e.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ test('Switching between indexed databases', async t => {
5757
const rememberedConnectedClients = await browserPage.overviewConnectedClients.textContent;
5858

5959
// Change index to logical db
60+
// Verify that database index switcher displayed for Standalone db
6061
await databaseOverviewPage.changeDbIndex(1);
6162
// Verify that the same client connections are used after changing index
6263
const logicalDbConnectedClients = await browserPage.overviewConnectedClients.textContent;
@@ -99,17 +100,14 @@ test('Switching between indexed databases', async t => {
99100
await verifyKeysDisplayedInTheList(keyNames);
100101
// Change index to logical db
101102
await databaseOverviewPage.changeDbIndex(1);
102-
// Verify that data changed for indexed db on Search capability page
103-
// await t.expect(browserPage.keyListTable.textContent).contains('No results found.', 'Data not changed for indexed db');
104-
105103
// Search by value and return to default database
106104
await browserPage.searchByKeyName('Hall School');
107105
await databaseOverviewPage.changeDbIndex(0);
106+
// Verify that data changed for indexed db on Search capability page
108107
await verifyKeysDisplayedInTheList([keyNames[0]]);
109108
// Change index to logical db
110109
await databaseOverviewPage.changeDbIndex(1);
111110
// Verify that search/filter saved after switching index in Search capability
112-
// await t.expect(browserPage.keyListTable.textContent).contains('No results found.', 'Data not changed for indexed db');
113111
await verifySearchFilterValue('Hall School');
114112

115113
// Open Workbench page

tests/e2e/tests/regression/cli/cli-re-cluster.e2e.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
acceptLicenseTermsAndAddSentinelDatabaseApi,
88
deleteDatabase
99
} from '../../../helpers/database';
10-
import { BrowserPage, CliPage } from '../../../pageObjects';
10+
import { BrowserPage, CliPage, DatabaseOverviewPage } from '../../../pageObjects';
1111
import {
1212
cloudDatabaseConfig,
1313
commonUrl, ossClusterConfig,
@@ -20,6 +20,7 @@ import { deleteOSSClusterDatabaseApi, deleteAllSentinelDatabasesApi } from '../.
2020
const browserPage = new BrowserPage();
2121
const cliPage = new CliPage();
2222
const common = new Common();
23+
const databaseOverviewPage = new DatabaseOverviewPage();
2324

2425
let keyName = common.generateWord(10);
2526
const verifyCommandsInCli = async(): Promise<void> => {
@@ -48,6 +49,9 @@ test
4849
await browserPage.deleteKeyByName(keyName);
4950
await deleteDatabase(redisEnterpriseClusterConfig.databaseName);
5051
})('Verify that user can add data via CLI in RE Cluster DB', async() => {
52+
// Verify that database index switcher not displayed for RE Cluster
53+
await t.expect(databaseOverviewPage.changeIndexBtn.exists).notOk('Change Db index control displayed for RE Cluster DB');
54+
5155
await verifyCommandsInCli();
5256
});
5357
test
@@ -60,6 +64,9 @@ test
6064
await browserPage.deleteKeyByName(keyName);
6165
await deleteDatabase(cloudDatabaseConfig.databaseName);
6266
})('Verify that user can add data via CLI in RE Cloud DB', async() => {
67+
// Verify that database index switcher not displayed for RE Cloud
68+
await t.expect(databaseOverviewPage.changeIndexBtn.exists).notOk('Change Db index control displayed for RE Cloud DB');
69+
6370
await verifyCommandsInCli();
6471
});
6572
test
@@ -72,6 +79,9 @@ test
7279
await browserPage.deleteKeyByName(keyName);
7380
await deleteOSSClusterDatabaseApi(ossClusterConfig);
7481
})('Verify that user can add data via CLI in OSS Cluster DB', async() => {
82+
// Verify that database index switcher not displayed for RE Cloud
83+
await t.expect(databaseOverviewPage.changeIndexBtn.exists).notOk('Change Db index control displayed for OSS Cluster DB');
84+
7585
await verifyCommandsInCli();
7686
});
7787
test
@@ -84,5 +94,8 @@ test
8494
await browserPage.deleteKeyByName(keyName);
8595
await deleteAllSentinelDatabasesApi(ossSentinelConfig);
8696
})('Verify that user can add data via CLI in Sentinel Primary Group', async() => {
97+
// Verify that database index switcher displayed for Sentinel
98+
await t.expect(databaseOverviewPage.changeIndexBtn.exists).notOk('Change Db index control not displayed for Sentinel DB');
99+
87100
await verifyCommandsInCli();
88101
});

tests/e2e/tests/regression/database-overview/database-info.e2e.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ fixture `Database info tooltips`
2424
});
2525
test('Verify that user can see DB name, endpoint, connection type, Redis version, user name in tooltip when hover over the (i) icon', async t => {
2626
const version = /[0-9].[0-9].[0-9]/;
27+
const logicalDbText = 'Select logical databases to work with in Browser, Workbench, and Database Analysis.';
2728

2829
await t.hover(browserPage.databaseInfoIcon);
2930
await t.expect(browserPage.databaseInfoToolTip.textContent).contains(ossStandaloneConfig.databaseName, 'User can see database name in tooltip');
3031
await t.expect(browserPage.databaseInfoToolTip.textContent).contains(`${ossStandaloneConfig.host}:${ossStandaloneConfig.port}`, 'User can see endpoint in tooltip');
3132
await t.expect(browserPage.databaseInfoToolTip.textContent).contains('Standalone', 'User can not see connection type in tooltip');
3233
await t.expect(browserPage.databaseInfoToolTip.textContent).match(version, 'User can not see Redis version in tooltip');
3334
await t.expect(browserPage.databaseInfoToolTip.textContent).contains('Default', 'User can not see user name in tooltip');
35+
// Verify that user can see the tooltip by hovering on index control switcher
36+
await t.expect(browserPage.databaseInfoToolTip.textContent).contains('Logical Databases', 'Logical Databases text not displayed in tooltip');
37+
await t.expect(browserPage.databaseInfoToolTip.textContent).contains(logicalDbText, 'Logical Databases text not displayed in tooltip');
3438

3539
// Verify that user can see an (i) icon next to the database name on Browser and Workbench pages
3640
await t.expect(browserPage.databaseInfoIcon.visible).ok('User can not see (i) icon on Browser page', { timeout: 10000 });

0 commit comments

Comments
 (0)