Skip to content

Commit c14c65e

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #2163 from RedisInsight/e2e/bugfix/nighly-tests-fixes
e2e/fixes for failed nightly tests
2 parents 5f27adc + 24bcbfa commit c14c65e

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

‎tests/e2e/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@types/axios": "^0.14.0",
3636
"@types/chance": "1.1.3",
3737
"@types/edit-json-file": "1.7.0",
38-
"@types/fs-extra": "^11.0.1",
38+
"@types/fs-extra": "9.0.11",
3939
"@types/sqlite3": "^3.1.8",
4040
"@types/supertest": "^2.0.8",
4141
"@typescript-eslint/eslint-plugin": "4.28.2",
@@ -48,7 +48,7 @@
4848
"edit-json-file": "1.7.0",
4949
"eslint": "7.32.0",
5050
"eslint-plugin-import": "2.24.2",
51-
"fs-extra": "^11.1.1",
51+
"fs-extra": "^10.0.0",
5252
"redis": "3.1.1",
5353
"sqlite3": "5.0.10",
5454
"supertest": "^4.0.2",

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { t } from 'testcafe';
2+
import { Chance } from 'chance';
23
import {
34
addNewREClusterDatabase,
45
addOSSClusterDatabase,
@@ -20,6 +21,8 @@ import { Telemetry } from '../../../helpers/telemetry';
2021
const browserPage = new BrowserPage();
2122
const myRedisDatabasePage = new MyRedisDatabasePage();
2223
const telemetry = new Telemetry();
24+
const chance = new Chance();
25+
2326
const logger = telemetry.createLogger();
2427
const telemetryEvent = 'CONFIG_DATABASES_OPEN_DATABASE';
2528
const expectedProperties = [
@@ -33,6 +36,7 @@ const expectedProperties = [
3336
'RedisTimeSeries',
3437
'customModules'
3538
];
39+
let databaseName = `test_standalone-${chance.string({ length: 10 })}`;
3640

3741
fixture `Add database`
3842
.meta({ type: 'smoke' })
@@ -44,9 +48,10 @@ test
4448
.meta({ rte: rte.standalone })
4549
.requestHooks(logger)
4650
.after(async() => {
47-
await deleteDatabase(ossStandaloneConfig.databaseName);
51+
await deleteDatabase(databaseName);
4852
})('Verify that user can add Standalone Database', async() => {
4953
const connectionTimeout = '20';
54+
databaseName = `test_standalone-${chance.string({ length: 10 })}`;
5055

5156
// Fill the add database form
5257
await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.with({ visibilityCheck: true, timeout: 10000 })();
@@ -56,29 +61,29 @@ test
5661
await t
5762
.typeText(myRedisDatabasePage.AddRedisDatabase.hostInput, ossStandaloneConfig.host, { replace: true, paste: true })
5863
.typeText(myRedisDatabasePage.AddRedisDatabase.portInput, ossStandaloneConfig.port, { replace: true, paste: true })
59-
.typeText(myRedisDatabasePage.AddRedisDatabase.databaseAliasInput, ossStandaloneConfig.databaseName, { replace: true, paste: true })
64+
.typeText(myRedisDatabasePage.AddRedisDatabase.databaseAliasInput, databaseName, { replace: true, paste: true })
6065
// Verify that user can customize the connection timeout for the manual flow
6166
.typeText(myRedisDatabasePage.AddRedisDatabase.timeoutInput, connectionTimeout, { replace: true, paste: true });
6267
await t
6368
.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
6469
// Wait for database to be exist
65-
.expect(myRedisDatabasePage.dbNameList.withExactText(ossStandaloneConfig.databaseName).exists).ok('The database not displayed', { timeout: 10000 })
70+
.expect(myRedisDatabasePage.dbNameList.withExactText(databaseName).exists).ok('The database not displayed', { timeout: 10000 })
6671
// Close message
6772
.click(myRedisDatabasePage.Toast.toastCloseButton);
6873

6974
// Verify that user can see an indicator of databases that are added manually and not opened yet
70-
await myRedisDatabasePage.verifyDatabaseStatusIsVisible(ossStandaloneConfig.databaseName);
71-
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
75+
await myRedisDatabasePage.verifyDatabaseStatusIsVisible(databaseName);
76+
await myRedisDatabasePage.clickOnDBByName(databaseName);
7277

7378
// Verify that telemetry event 'CONFIG_DATABASES_OPEN_DATABASE' sent and has all expected properties
7479
await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
7580

7681
await t.click(browserPage.OverviewPanel.myRedisDbIcon);
7782
// Verify that user can't see an indicator of databases that were opened
78-
await myRedisDatabasePage.verifyDatabaseStatusIsNotVisible(ossStandaloneConfig.databaseName);
83+
await myRedisDatabasePage.verifyDatabaseStatusIsNotVisible(databaseName);
7984

8085
// Verify that connection timeout value saved
81-
await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneConfig.databaseName);
86+
await myRedisDatabasePage.clickOnEditDBByName(databaseName);
8287
await t.expect(myRedisDatabasePage.AddRedisDatabase.timeoutInput.value).eql(connectionTimeout, 'Connection timeout is not customized');
8388
});
8489
test

‎tests/e2e/yarn.lock‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,12 +1265,11 @@
12651265
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
12661266
integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
12671267

1268-
"@types/fs-extra@^11.0.1":
1269-
version "11.0.1"
1270-
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.1.tgz#f542ec47810532a8a252127e6e105f487e0a6ea5"
1271-
integrity sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==
1268+
"@types/fs-extra@9.0.11":
1269+
version "9.0.11"
1270+
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"
1271+
integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==
12721272
dependencies:
1273-
"@types/jsonfile" "*"
12741273
"@types/node" "*"
12751274

12761275
"@types/glob@^7.1.1":
@@ -1291,13 +1290,6 @@
12911290
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
12921291
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
12931292

1294-
"@types/jsonfile@*":
1295-
version "6.1.1"
1296-
resolved "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.1.tgz#ac84e9aefa74a2425a0fb3012bdea44f58970f1b"
1297-
integrity sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==
1298-
dependencies:
1299-
"@types/node" "*"
1300-
13011293
"@types/[email protected]", "@types/lodash@^4.14.72":
13021294
version "4.14.192"
13031295
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.192.tgz#5790406361a2852d332d41635d927f1600811285"
@@ -3082,10 +3074,10 @@ fs-constants@^1.0.0:
30823074
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
30833075
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
30843076

3085-
fs-extra@^11.1.1:
3086-
version "11.1.1"
3087-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
3088-
integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
3077+
fs-extra@^10.0.0:
3078+
version "10.1.0"
3079+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
3080+
integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
30893081
dependencies:
30903082
graceful-fs "^4.2.0"
30913083
jsonfile "^6.0.1"

0 commit comments

Comments
 (0)