Skip to content

Commit 302660e

Browse files
vlad-dargelvlad-dargel
committed
updates for failed e2e
1 parent 1c94dfb commit 302660e

File tree

9 files changed

+36
-15
lines changed

9 files changed

+36
-15
lines changed

‎tests/e2e/helpers/database.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { UserAgreementDialog } from '../pageObjects/dialogs';
1414
import { DatabaseAPIRequests } from './api/api-database';
1515
import { RedisOverviewPage } from './constants';
1616
import { RdiInstancesListPage } from '../pageObjects/rdi-instances-list-page';
17+
import { updateControlNumber } from './insights';
1718

1819
const myRedisDatabasePage = new MyRedisDatabasePage();
1920
const discoverMasterGroupsPage = new DiscoverMasterGroupsPage();
@@ -348,6 +349,7 @@ export class DatabaseHelper {
348349
async acceptLicenseTerms(): Promise<void> {
349350
await t.maximizeWindow();
350351
await userAgreementDialog.acceptLicenseTerms();
352+
await updateControlNumber(48.2);
351353
// Open default databases list tab if RDI opened
352354
if (await rdiInstancesListPage.rdiInstanceButton.exists) {
353355
await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ test('Adding database with SSH', async t => {
110110
.expect(myRedisDatabasePage.AddRedisDatabase.sshPassphraseInput.value).eql(hiddenPass, 'Edited Passphrase not saved');
111111

112112
// Verify that user can clone database with SSH tunnel
113-
await databaseHelper.clickOnEditDatabaseByName(sshDbPrivateKey.databaseName);
114113
await t.click(myRedisDatabasePage.AddRedisDatabase.cloneDatabaseButton);
115114
// Edit Database alias before cloning
116115
await t.typeText(myRedisDatabasePage.AddRedisDatabase.databaseAliasInput, newClonedDatabaseAlias, { replace: true });

‎tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ test
155155
.expect(myRedisDatabasePage.AddRedisDatabase.sshPassphraseInput.value).eql(hiddenPass, 'Edited Passphrase not saved');
156156

157157
// Verify that user can clone database with SSH tunnel
158+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
158159
await databaseHelper.clickOnEditDatabaseByName(sshDbPrivateKey.databaseName);
159160
await t.click(myRedisDatabasePage.AddRedisDatabase.cloneDatabaseButton);
160161
// Edit Database alias before cloning

‎tests/e2e/tests/web/critical-path/database/encryption.e2e.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ test('Verify that data encrypted using KEY', async t => {
4545
.eql('KEY', 'Encryption is not applied by RI_ENCRYPTION_KEY');
4646
await databaseHelper.clickOnEditDatabaseByName(ossSentinelConfig.masters[1].alias);
4747
await t.expect(myRedisDatabasePage.Toast.toastError.textContent).contains(decryptionError, 'Invalid encrypted field is decrypted');
48+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
4849
});

‎tests/e2e/tests/web/critical-path/database/export-databases.e2e.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ test
9595

9696
await databaseHelper.clickOnEditDatabaseByName(ossStandaloneConfig.databaseName);
9797
await t.expect(myRedisDatabasePage.AddRedisDatabase.selectCompressor.textContent).eql(compressor, 'Compressor import incorrect');
98+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
9899
});
99100
test
100101
.before(async() => {

‎tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ test.before(async() => {
123123
await t.click(myRedisDatabasePage.retryImportBtn);
124124
await t.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [rdmData.path]);
125125

126-
await t.expect(myRedisDatabasePage.importDatabaseInput.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
126+
await t.expect(myRedisDatabasePage.addDatabaseImport.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
127127
// Click on remove button
128128
await t.click(myRedisDatabasePage.removeImportedFileBtn);
129-
await t.expect(myRedisDatabasePage.importDatabaseInput.textContent).contains(defaultText, 'File not removed from import input');
129+
await t.expect(myRedisDatabasePage.addDatabaseImport.textContent).contains(defaultText, 'File not removed from import input');
130130
});
131131
test('Connection import from JSON', async t => {
132132
// Verify that user can import database with mandatory/optional fields
@@ -153,9 +153,11 @@ test('Connection import from JSON', async t => {
153153
// Verify that user can see 12 hidden characters regardless of the actual database password when it is set
154154
await t.expect(myRedisDatabasePage.AddRedisDatabase.passwordInput.value).eql(hiddenPassword, 'Password import incorrect');
155155

156+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
156157
// Verify cluster connection type imported
157158
await databaseHelper.clickOnEditDatabaseByName(rdmData.dbImportedNames[2]);
158159
await t.expect(myRedisDatabasePage.AddRedisDatabase.connectionType.textContent).eql(rdmData.connectionType, 'Connection type import incorrect');
160+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
159161

160162
/*
161163
Verify that user can import database with CA certificate
@@ -165,24 +167,29 @@ test('Connection import from JSON', async t => {
165167
await databaseHelper.clickOnEditDatabaseByName(await findImportedRdmDbNameInList('rdmHost+Port+Name+CaCert'));
166168
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('ca', 'CA certificate import incorrect');
167169
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.exists).notOk('Client certificate was imported');
170+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
168171

169172
// Verify that user can import database with Client certificate, Client private key
170173
await databaseHelper.clickOnEditDatabaseByName(await findImportedRdmDbNameInList('rdmHost+Port+Name+clientCert+privateKey'));
171174
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('No CA Certificate', 'CA certificate was imported');
172175
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql('client', 'Client certificate import incorrect');
176+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
173177

174178
// Verify that user can import database with all certificates
175179
await databaseHelper.clickOnEditDatabaseByName(await findImportedRdmDbNameInList('rdmHost+Port+Name+CaCert+clientCert+privateKey'));
176180
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('ca', 'CA certificate import incorrect');
177181
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql('client', 'Client certificate import incorrect');
182+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
178183

179184
// Verify that certificate not imported when any certificate field has not been parsed
180185
await databaseHelper.clickOnEditDatabaseByName(await findImportedRdmDbNameInList('rdmCaCertInvalidBody'));
181186
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('No CA Certificate', 'CA certificate was imported');
182187
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.exists).notOk('Client certificate was imported');
188+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
183189
await databaseHelper.clickOnEditDatabaseByName(await findImportedRdmDbNameInList('rdmInvalidClientCert'));
184190
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('No CA Certificate', 'CA certificate was imported');
185191
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.exists).notOk('Client certificate was imported');
192+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
186193

187194
// Verify that user can import files from Racompass, ARDM, RDM
188195
for (const db of dbData) {
@@ -194,6 +201,7 @@ test('Connection import from JSON', async t => {
194201
// Verify that user can import Sentinel database connections by corresponding fields in JSON
195202
await databaseHelper.clickOnEditDatabaseByName(dbData[1].dbNames[2]);
196203
await t.expect(myRedisDatabasePage.AddRedisDatabase.sentinelForm.textContent).contains('Sentinel', 'Sentinel connection type import incorrect');
204+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
197205
await myRedisDatabasePage.clickOnDBByName(dbData[1].dbNames[2]);
198206
await Common.checkURLContainsText('browser');
199207
});
@@ -205,29 +213,35 @@ test('Certificates import with/without path', async t => {
205213
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[0].name);
206214
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql(rdmListOfCertsDB[0].caCert.name, 'CA certificate import incorrect');
207215
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql(rdmListOfCertsDB[0].clientCert.name, 'Client certificate import incorrect');
216+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
208217

209218
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[1].name);
210219
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql(rdmListOfCertsDB[0].caCert.name, 'CA certificate name with the same body is incorrect');
211220
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql(rdmListOfCertsDB[0].clientCert.name, 'Client certificate name with the same body is incorrect');
221+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
212222

213223
// Verify that when user imports a certificate and the same certificate name exists but with a different body, the certificate imported with "({incremental_number})_certificate_name" name
214224
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[2].name);
215225
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql(`1_${rdmListOfCertsDB[0].caCert.name}`, 'CA certificate name with the same body is incorrect');
216226
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql(`1_${rdmListOfCertsDB[0].clientCert.name}`, 'Client certificate name with the same body is incorrect');
227+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
217228

218229
// Verify that when user imports a certificate by path and the same certificate body already exists, the existing certificate (with its name) is applied
219230
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[3].name);
220231
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('caPath', 'CA certificate import incorrect');
221232
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql('clientPath', 'Client certificate import incorrect');
233+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
222234

223235
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[4].name);
224236
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('caPath', 'CA certificate import incorrect');
225237
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql('clientPath', 'Client certificate import incorrect');
238+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
226239

227240
// Verify that when user imports a certificate by path and the same certificate name exists but with a different body, the certificate imported with "({incremental_number})certificate_name" name
228241
await databaseHelper.clickOnEditDatabaseByName(rdmListOfCertsDB[5].name);
229242
await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).eql('1_caPath', 'CA certificate import incorrect');
230243
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).eql('1_clientPath', 'Client certificate import incorrect');
244+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
231245
});
232246
test('Import SSH parameters', async t => {
233247
const sshAgentsResult = 'SSH Agents are not supported';
@@ -255,10 +269,12 @@ test('Import SSH parameters', async t => {
255269
await t.expect(myRedisDatabasePage.AddRedisDatabase.sshUsernameInput.value).eql(racompListOfSSHDB[0].sshUser, 'SSH username import incorrect');
256270
// Verify that password, passphrase and private key are hidden for SSH option
257271
await t.expect(myRedisDatabasePage.AddRedisDatabase.sshPasswordInput.value).eql(hiddenPassword, 'SSH password import incorrect');
272+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
258273

259274
await databaseHelper.clickOnEditDatabaseByName(racompListOfSSHDB[1].name);
260275
// Verify that user can import the SSH Private Key both by its value specified in the file and by the file path
261276
await t.expect(myRedisDatabasePage.AddRedisDatabase.sshPrivateKeyInput.textContent).contains(hiddenPassword, 'SSH Private key import incorrect');
262277
// Verify that user can import the SSH parameters with Passcode
263278
await t.expect(myRedisDatabasePage.AddRedisDatabase.sshPassphraseInput.value).eql(hiddenPassword, 'SSH Passphrase import incorrect');
279+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
264280
});

‎tests/e2e/tests/web/critical-path/database/modules.e2e.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ test('Verify that user can see full module list in the Edit mode', async t => {
6565
await t.expect(myRedisDatabasePage.connectionTypeTitle.visible).ok('connection type column not found');
6666
// Open Edit mode
6767
await t.click(myRedisDatabasePage.editDatabaseButton);
68-
await myRedisDatabasePage.NavigationHeader.togglePanel(true);
69-
// Verify that module column is not displayed
70-
await t.expect(myRedisDatabasePage.connectionTypeTitle.visible).notOk('connection type column not found');
68+
// **** Deprecated **** Verify that module column is not displayed
69+
// await myRedisDatabasePage.NavigationHeader.togglePanel(true);
70+
// await t.expect(myRedisDatabasePage.connectionTypeTitle.visible).notOk('connection type column not found');
7171
// Verify modules in Edit mode
7272
await myRedisDatabasePage.checkModulesOnPage(moduleList);
7373
});

‎tests/e2e/tests/web/regression/database-overview/database-tls-certificates.e2e.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ test('Verify that user can remove added certificates', async t => {
4545
await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
4646
await t.click(myRedisDatabasePage.AddRedisDatabase.requiresTlsClientCheckbox);
4747
await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).contains('Add new certificate', 'Client certificate was not deleted');
48+
await myRedisDatabasePage.reloadPage();
4849

49-
//TODO should be uncommented when the bug is fixed https://redislabs.atlassian.net/browse/RI-6136
50-
51-
// await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
52-
// await t.expect(myRedisDatabasePage.AddRedisDatabase.requiresTlsClientCheckbox.checked).notOk('the certificate was not removed');
50+
await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
51+
await t.expect(myRedisDatabasePage.AddRedisDatabase.requiresTlsClientCheckbox.checked).notOk('the certificate was not removed');
52+
await myRedisDatabasePage.reloadPage();
5353

54-
// await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName!);
55-
//
56-
// await t.click(browserPage.NavigationPanel.myRedisDBButton);
57-
// await myRedisDatabasePage.clickOnDBByName(ossStandaloneTlsConfig.databaseName);
58-
// await t.expect(browserPage.Toast.toastError.textContent).contains('CA or Client certificate', 'user can connect to db without certificates');
54+
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName!);
55+
56+
await t.click(browserPage.NavigationPanel.myRedisDBButton);
57+
await myRedisDatabasePage.clickOnDBByName(ossStandaloneTlsConfig.databaseName);
58+
await t.expect(browserPage.Toast.toastError.textContent).contains('CA or Client certificate', 'user can connect to db without certificates');
5959
});

‎tests/e2e/tests/web/smoke/database/add-standalone-db.e2e.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ test
8383
// Verify that connection timeout value saved
8484
await myRedisDatabasePage.clickOnEditDBByName(databaseName);
8585
await t.expect(myRedisDatabasePage.AddRedisDatabase.timeoutInput.value).eql(connectionTimeout, 'Connection timeout is not customized');
86+
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
8687
});
8788
test
8889
.meta({ rte: rte.ossCluster })

0 commit comments

Comments
 (0)