Skip to content

Commit 030d848

Browse files
committed
Add standalone-2
1 parent 61d00c9 commit 030d848

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

tests/e2e/helpers/conf.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Chance } from 'chance';
21
import * as os from 'os';
32
import * as fs from 'fs';
43
import { join as joinPath } from 'path';
4+
import { Chance } from 'chance';
55
const chance = new Chance();
66

77
// Urls for using in the tests
@@ -19,6 +19,14 @@ export const ossStandaloneConfig = {
1919
databasePassword: process.env.OSS_STANDALONE_PASSWORD
2020
};
2121

22+
export const ossStandaloneConfig2 = {
23+
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone-2',
24+
port: process.env.OSS_STANDALONE_PORT || '6379',
25+
databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'test_standalone'}-${uniqueId}`,
26+
databaseUsername: process.env.OSS_STANDALONE_USERNAME,
27+
databasePassword: process.env.OSS_STANDALONE_PASSWORD
28+
};
29+
2230
export const ossStandaloneV5Config = {
2331
host: process.env.OSS_STANDALONE_V5_HOST || 'oss-standalone-v5',
2432
port: process.env.OSS_STANDALONE_V5_PORT || '6379',

tests/e2e/rte.docker-compose.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ services:
3333
ports:
3434
- 8100:6379
3535

36+
oss-standalone-2:
37+
image: redislabs/redismod
38+
command: [
39+
"--loadmodule", "/usr/lib/redis/modules/redisearch.so",
40+
"--loadmodule", "/usr/lib/redis/modules/redisgraph.so",
41+
"--loadmodule", "/usr/lib/redis/modules/redistimeseries.so",
42+
"--loadmodule", "/usr/lib/redis/modules/rejson.so",
43+
"--loadmodule", "/usr/lib/redis/modules/redisbloom.so"
44+
]
45+
ports:
46+
- 8105:6379
47+
3648
# oss standalone v5
3749
oss-standalone-v5:
3850
image: redis:5

tests/e2e/tests/regression/browser/onboarding.e2e.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
acceptTermsAddDatabaseOrConnectToRedisStack, deleteDatabase
44
} from '../../../helpers/database';
55
import {
6-
commonUrl, ossStandaloneConfig
6+
commonUrl, ossStandaloneConfig2
77
} from '../../../helpers/conf';
88
import { env, rte } from '../../../helpers/constants';
99
import {Common} from '../../../helpers/common';
@@ -34,21 +34,16 @@ fixture `Onboarding new user tests`
3434
.meta({type: 'regression', rte: rte.standalone })
3535
.page(commonUrl)
3636
.beforeEach(async() => {
37-
await acceptTermsAddDatabaseOrConnectToRedisStack(ossStandaloneConfig, ossStandaloneConfig.databaseName);
37+
await acceptTermsAddDatabaseOrConnectToRedisStack(ossStandaloneConfig2, ossStandaloneConfig2.databaseName);
3838
await setLocalStorageItem('onboardingStep', '0');
3939
await common.reloadPage();
4040
})
4141
.afterEach(async() => {
4242
await cliPage.sendCommandInCli(`DEL ${indexName}`);
43-
await deleteDatabase(ossStandaloneConfig.databaseName);
43+
await deleteDatabase(ossStandaloneConfig2.databaseName);
4444
});
4545
// https://redislabs.atlassian.net/browse/RI-4070, https://redislabs.atlassian.net/browse/RI-4067
46-
test.before(async() => {
47-
await acceptTermsAddDatabaseOrConnectToRedisStack(ossStandaloneConfig, ossStandaloneConfig.databaseName);
48-
await cliPage.sendCommandInCli('flushdb'); // to delete all indexes in order not to fail FT.INFO ${indexName}
49-
await setLocalStorageItem('onboardingStep', '0');
50-
await common.reloadPage();
51-
})
46+
test
5247
.meta({ env: env.desktop })('Verify onbarding new user steps', async t => {
5348
await onBoardActions.startOnboarding();
5449
// verify browser step is visible
@@ -112,7 +107,7 @@ test.before(async() => {
112107
// verify onboarding step completed successfully
113108
await onBoardActions.verifyOnboardingCompleted();
114109
});
115-
// https://redislabs.atlassian.net/browse/RI-4070
110+
// https://redislabs.atlassian.net/browse/RI-4067
116111
test
117112
.meta({ env: env.desktop })('verify onboard new user skip tour', async() => {
118113
// start onboarding process

0 commit comments

Comments
 (0)