Skip to content

Commit d17a45f

Browse files
vlad-dargelvlad-dargel
committed
fixes by pr comments
1 parent 111d225 commit d17a45f

32 files changed

+245
-241
lines changed

‎tests/e2e/common-actions/databases-actions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class DatabasesActions {
2424
*/
2525
async importDatabase(fileParameters: ImportDatabaseParameters): Promise<void> {
2626
await t
27-
.click(myRedisDatabasePage.AddRedisDatabase.addDatabaseButton)
27+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton)
2828
.click(myRedisDatabasePage.importDatabasesBtn)
2929
.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [fileParameters.path])
3030
.click(myRedisDatabasePage.submitChangesButton)

‎tests/e2e/helpers/api/api-database.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
databaseParameters,
88
SentinelParameters,
99
ClusterNodes
10-
} from '../../pageObjects/components/myRedisDatabase/add-redis-database';
10+
} from '../../pageObjects/dialogs/add-redis-database-dialog';
1111
import { ResourcePath } from '../constants';
1212
import {
1313
sendGetRequest,

‎tests/e2e/helpers/database.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
AddNewDatabaseParameters,
44
SentinelParameters,
55
OSSClusterParameters
6-
} from '../pageObjects/components/myRedisDatabase/add-redis-database';
6+
} from '../pageObjects/dialogs/add-redis-database-dialog';
77
import { DiscoverMasterGroupsPage } from '../pageObjects/sentinel/discovered-sentinel-master-groups-page';
88
import {
99
MyRedisDatabasePage,
@@ -33,12 +33,12 @@ export class DatabaseHelper {
3333
databaseParameters: AddNewDatabaseParameters
3434
): Promise<void> {
3535
// Fill the add database form
36-
await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
36+
await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
3737
databaseParameters
3838
);
3939
// Click for saving
4040
await t
41-
.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
41+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
4242
// Wait for database to be exist
4343
.expect(
4444
myRedisDatabasePage.dbNameList.withExactText(
@@ -58,13 +58,13 @@ export class DatabaseHelper {
5858
databaseParameters: SentinelParameters
5959
): Promise<void> {
6060
// Fill sentinel parameters to auto-discover Master Groups
61-
await myRedisDatabasePage.AddRedisDatabase.discoverSentinelDatabases(
61+
await myRedisDatabasePage.AddRedisDatabaseDialog.discoverSentinelDatabases(
6262
databaseParameters
6363
);
6464
// Click for autodiscover
6565
await t
6666
.click(
67-
myRedisDatabasePage.AddRedisDatabase
67+
myRedisDatabasePage.AddRedisDatabaseDialog
6868
.addRedisDatabaseButton
6969
)
7070
.expect(discoverMasterGroupsPage.addPrimaryGroupButton.exists)
@@ -84,12 +84,12 @@ export class DatabaseHelper {
8484
databaseParameters: AddNewDatabaseParameters
8585
): Promise<void> {
8686
// Fill the add database form
87-
await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverREClusterDatabase(
87+
await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverREClusterDatabase(
8888
databaseParameters
8989
);
9090
// Click on submit button
9191
await t
92-
.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
92+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
9393
// Wait for database to be exist in the list of Autodiscover databases and select it
9494
.expect(
9595
autoDiscoverREDatabases.databaseName.withExactText(
@@ -115,12 +115,12 @@ export class DatabaseHelper {
115115
databaseParameters: OSSClusterParameters
116116
): Promise<void> {
117117
// Enter required parameters for OSS Cluster
118-
await myRedisDatabasePage.AddRedisDatabase.addOssClusterDatabase(
118+
await myRedisDatabasePage.AddRedisDatabaseDialog.addOssClusterDatabase(
119119
databaseParameters
120120
);
121121
// Click for saving
122122
await t
123-
.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
123+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
124124
// Check for info message that DB was added
125125
.expect(myRedisDatabasePage.Toast.toastHeader.exists)
126126
.ok('Info message not exists', { timeout: 10000 })
@@ -143,12 +143,12 @@ export class DatabaseHelper {
143143
cloudAPISecretKey: string
144144
): Promise<string> {
145145
// Fill the add database form and Submit
146-
await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverRECloudDatabase(
146+
await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRECloudDatabase(
147147
cloudAPIAccessKey,
148148
cloudAPISecretKey
149149
);
150150
await t.click(
151-
myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
151+
myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
152152
);
153153
await t
154154
.expect(
@@ -158,8 +158,8 @@ export class DatabaseHelper {
158158
)
159159
.ok('Subscriptions list not displayed', { timeout: 120000 });
160160
// Select subscriptions
161-
await t.click(myRedisDatabasePage.AddRedisDatabase.selectAllCheckbox);
162-
await t.click(myRedisDatabasePage.AddRedisDatabase.showDatabasesButton);
161+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.selectAllCheckbox);
162+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.showDatabasesButton);
163163
// Select databases for adding
164164
const databaseName = await autoDiscoverREDatabases.getDatabaseName();
165165
await t.click(autoDiscoverREDatabases.databaseCheckbox);
@@ -278,12 +278,12 @@ export class DatabaseHelper {
278278
const startTime = Date.now();
279279

280280
await this.acceptLicenseTerms();
281-
await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
281+
await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
282282
databaseParameters
283283
);
284284
// Click for saving
285285
await t.click(
286-
myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
286+
myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
287287
);
288288
await t.wait(3000);
289289
// Reload page until db appears
@@ -321,12 +321,12 @@ export class DatabaseHelper {
321321
);
322322
const startTime = Date.now();
323323

324-
await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
324+
await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
325325
databaseParameters
326326
);
327327
// Click for saving
328328
await t.click(
329-
myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
329+
myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
330330
);
331331
await t.wait(3000);
332332
// Reload page until db appears
@@ -355,8 +355,8 @@ export class DatabaseHelper {
355355
await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase);
356356
}
357357
// TODO delete after releasing chatbot
358-
if (await myRedisDatabasePage.AddRedisDatabase.aiChatMessage.exists) {
359-
await t.click(myRedisDatabasePage.AddRedisDatabase.aiCloseMessage)
358+
if (await myRedisDatabasePage.AddRedisDatabaseDialog.aiChatMessage.exists) {
359+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.aiCloseMessage)
360360
}
361361
}
362362

@@ -367,7 +367,7 @@ export class DatabaseHelper {
367367
await t
368368
.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton)
369369
.click(
370-
myRedisDatabasePage.AddRedisDatabase.connectToRedisStackButton
370+
myRedisDatabasePage.AddRedisDatabaseDialog.connectToRedisStackButton
371371
);
372372
}
373373

@@ -378,7 +378,7 @@ export class DatabaseHelper {
378378
async deleteDatabase(databaseName: string): Promise<void> {
379379
await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
380380
if (
381-
await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
381+
await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
382382
) {
383383
await this.deleteDatabaseByNameApi(databaseName);
384384
}
@@ -391,7 +391,7 @@ export class DatabaseHelper {
391391
async deleteCustomDatabase(databaseName: string): Promise<void> {
392392
await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
393393
if (
394-
await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
394+
await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
395395
) {
396396
await myRedisDatabasePage.deleteDatabaseByName(databaseName);
397397
}
@@ -406,7 +406,7 @@ export class DatabaseHelper {
406406
databaseParameters: AddNewDatabaseParameters
407407
): Promise<void> {
408408
if (
409-
await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
409+
await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
410410
) {
411411
await this.acceptLicenseTermsAndAddDatabase(databaseParameters);
412412
}

‎tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts‎ renamed to ‎tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Selector, t } from 'testcafe';
2-
import { TlsCertificates } from '../../../helpers/constants';
3-
import { RedisCloudSigninPanel } from '../redis-cloud-sign-in-panel';
2+
import { TlsCertificates } from '../../helpers/constants';
3+
import { RedisCloudSigninPanel } from '../components/redis-cloud-sign-in-panel';
44

5-
export class AddRedisDatabase {
5+
export class AddRedisDatabaseDialog {
66
RedisCloudSigninPanel = new RedisCloudSigninPanel();
77

88
//-------------------------------------------------------------------------------------------

‎tests/e2e/pageObjects/dialogs/index.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
import { AddRedisDatabaseDialog } from './add-redis-database-dialog';
2+
import { AuthorizationDialog } from './authorization-dialog';
13
import { OnboardingCardsDialog } from './onboarding-cards-dialog';
24
import { UserAgreementDialog } from './user-agreement-dialog';
35

6+
47
export {
8+
AddRedisDatabaseDialog,
9+
AuthorizationDialog,
510
OnboardingCardsDialog,
611
UserAgreementDialog
712
};

‎tests/e2e/pageObjects/my-redis-databases-page.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
import { t, Selector } from 'testcafe';
22
import { DatabaseAPIRequests } from '../helpers/api/api-database';
3-
import { AddRedisDatabase } from './components/myRedisDatabase/add-redis-database';
43
import { InsightsPanel } from './components/insights-panel';
54
import { BaseOverviewPage } from './base-overview-page';
65
import { NavigationPanel } from './components/navigation-panel';
76
import { NavigationHeader } from './components/navigation/navigation-header';
87
import { AuthorizationDialog } from './dialogs/authorization-dialog';
9-
import { RedisCloudSigninPanel } from './components/redis-cloud-sign-in-panel';
8+
import { AddRedisDatabaseDialog } from './dialogs';
109

1110
const databaseAPIRequests = new DatabaseAPIRequests();
1211

1312
export class MyRedisDatabasePage extends BaseOverviewPage {
1413

1514
NavigationPanel = new NavigationPanel();
16-
AddRedisDatabase = new AddRedisDatabase();
15+
AddRedisDatabaseDialog = new AddRedisDatabaseDialog();
1716
InsightsPanel = new InsightsPanel();
1817
NavigationHeader = new NavigationHeader();
1918
AuthorizationDialog = new AuthorizationDialog();

‎tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test('Verify that user should accept User Agreements to continue working with th
1515
await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
1616
// Verify that I still has agreements popup & cannot add a database
1717
await t.expect(userAgreementDialog.submitButton.hasAttribute('disabled')).ok('Submit button not disabled by default');
18-
await t.expect(myRedisDatabasePage.AddRedisDatabase.addDatabaseManually.exists).notOk('User can\'t add a database');
18+
await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually.exists).notOk('User can\'t add a database');
1919
});
2020
test('Verify that the encryption enabled by default and specific message', async t => {
2121
const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.';

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,55 +69,55 @@ test('Adding database with SSH', async t => {
6969
};
7070
// Verify that if user have not entered any required value he can see that this field should be specified when hover over the button to add a database
7171
await t
72-
.click(myRedisDatabasePage.AddRedisDatabase.addDatabaseButton)
73-
.click(myRedisDatabasePage.AddRedisDatabase.addDatabaseManually)
74-
.click(myRedisDatabasePage.AddRedisDatabase.useSSHCheckbox)
75-
.click(myRedisDatabasePage.AddRedisDatabase.sshPrivateKeyRadioBtn)
76-
.hover(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
72+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton)
73+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually)
74+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.useSSHCheckbox)
75+
.click(myRedisDatabasePage.AddRedisDatabaseDialog.sshPrivateKeyRadioBtn)
76+
.hover(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton);
7777
for (const text of tooltipText) {
7878
await browserActions.verifyTooltipContainsText(text, true);
7979
}
8080
// Verify that user can see the Test Connection button enabled/disabled with the same rules as the button to add/apply the changes
81-
await t.hover(myRedisDatabasePage.AddRedisDatabase.testConnectionBtn);
81+
await t.hover(myRedisDatabasePage.AddRedisDatabaseDialog.testConnectionBtn);
8282
for (const text of tooltipText) {
8383
await browserActions.verifyTooltipContainsText(text, true);
8484
}
8585

8686
// Verify that user can add SSH tunnel with Password for Standalone database
87-
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
88-
await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbPass, sshWithPass);
87+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.cancelButton);
88+
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbPass, sshWithPass);
8989
await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
9090
await Common.checkURLContainsText('browser');
9191

9292
// Verify that user can add SSH tunnel with Private Key
9393
await t.click(browserPage.OverviewPanel.myRedisDBLink);
94-
await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbPrivateKey, sshWithPrivateKey);
94+
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbPrivateKey, sshWithPrivateKey);
9595
await myRedisDatabasePage.clickOnDBByName(sshDbPrivateKey.databaseName);
9696
await Common.checkURLContainsText('browser');
9797

9898
// Verify that user can edit SSH parameters for existing database connections
9999
await t.click(browserPage.OverviewPanel.myRedisDBLink);
100100
await myRedisDatabasePage.clickOnEditDBByName(sshDbPrivateKey.databaseName);
101101
await t
102-
.typeText(myRedisDatabasePage.AddRedisDatabase.sshPrivateKeyInput, sshWithPassphrase.sshPrivateKey, { replace: true, paste: true })
103-
.typeText(myRedisDatabasePage.AddRedisDatabase.sshPassphraseInput, sshWithPassphrase.sshPassphrase, { replace: true, paste: true });
104-
await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
105-
await t.expect(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton.exists).notOk('Edit database panel still displayed');
102+
.typeText(myRedisDatabasePage.AddRedisDatabaseDialog.sshPrivateKeyInput, sshWithPassphrase.sshPrivateKey, { replace: true, paste: true })
103+
.typeText(myRedisDatabasePage.AddRedisDatabaseDialog.sshPassphraseInput, sshWithPassphrase.sshPassphrase, { replace: true, paste: true });
104+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton);
105+
await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton.exists).notOk('Edit database panel still displayed');
106106
await databaseHelper.clickOnEditDatabaseByName(sshDbPrivateKey.databaseName);
107107
// Verify that password, passphrase and private key are hidden for SSH option
108108
await t
109-
.expect(myRedisDatabasePage.AddRedisDatabase.sshPrivateKeyInput.textContent).eql(hiddenPass, 'Edited Private key not saved')
110-
.expect(myRedisDatabasePage.AddRedisDatabase.sshPassphraseInput.value).eql(hiddenPass, 'Edited Passphrase not saved');
109+
.expect(myRedisDatabasePage.AddRedisDatabaseDialog.sshPrivateKeyInput.textContent).eql(hiddenPass, 'Edited Private key not saved')
110+
.expect(myRedisDatabasePage.AddRedisDatabaseDialog.sshPassphraseInput.value).eql(hiddenPass, 'Edited Passphrase not saved');
111111

112112
// Verify that user can clone database with SSH tunnel
113-
await t.click(myRedisDatabasePage.AddRedisDatabase.cloneDatabaseButton);
113+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.cloneDatabaseButton);
114114
// Edit Database alias before cloning
115-
await t.typeText(myRedisDatabasePage.AddRedisDatabase.databaseAliasInput, newClonedDatabaseAlias, { replace: true });
116-
await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
115+
await t.typeText(myRedisDatabasePage.AddRedisDatabaseDialog.databaseAliasInput, newClonedDatabaseAlias, { replace: true });
116+
await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton);
117117
await t.expect(myRedisDatabasePage.dbNameList.withExactText(newClonedDatabaseAlias).exists).ok('DB with SSH was not cloned');
118118

119119
// Verify that user can add SSH tunnel with Passcode
120-
await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbPasscode, sshWithPassphrase);
120+
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbPasscode, sshWithPassphrase);
121121
await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
122122
await Common.checkURLContainsText('browser');
123123
});
@@ -127,7 +127,7 @@ test('Adding OSS Cluster database with SSH', async t => {
127127
sshPassword: 'pass'
128128
};
129129
// Verify that user can add SSH tunnel with Password for OSS Cluster database
130-
await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
130+
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
131131
await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
132132
await Common.checkURLContainsText('browser');
133133
});

0 commit comments

Comments
 (0)