Skip to content

Commit f368fb3

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #4164 from RedisInsight/e2e/bugfix/update-redis-db-version
e2e/bugfix/update-redis-db-version
2 parents 19880b0 + d51d80c commit f368fb3

File tree

10 files changed

+39
-41
lines changed

10 files changed

+39
-41
lines changed

‎tests/e2e/helpers/conf.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const fileDownloadPath = joinPath(os.homedir(), 'Downloads');
1818
const uniqueId = chance.string({ length: 10 });
1919

2020
export const ossStandaloneConfig = {
21-
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone',
21+
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone-v8',
2222
port: process.env.OSS_STANDALONE_PORT || '6379',
2323
databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'test_standalone'}-${uniqueId}`,
2424
databaseUsername: process.env.OSS_STANDALONE_USERNAME,
@@ -49,10 +49,10 @@ export const ossStandaloneV7Config = {
4949
databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD
5050
};
5151

52-
export const ossStandaloneV8Config = {
53-
host: process.env.OSS_STANDALONE_V8_HOST || 'oss-standalone-v8',
52+
export const ossStandaloneV6Config = {
53+
host: process.env.OSS_STANDALONE_V8_HOST || 'oss-standalone',
5454
port: process.env.OSS_STANDALONE_V8_PORT || '6379',
55-
databaseName: `${process.env.OSS_STANDALONE_V8_DATABASE_NAME || 'test_standalone-v8'}-${uniqueId}`,
55+
databaseName: `${process.env.OSS_STANDALONE_V8_DATABASE_NAME || 'test_standalone-v6'}-${uniqueId}`,
5656
databaseUsername: process.env.OSS_STANDALONE_V8_USERNAME,
5757
databasePassword: process.env.OSS_STANDALONE_V8_PASSWORD
5858
};

‎tests/e2e/rte.docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ services:
9595
# oss standalone v8
9696
oss-standalone-v8:
9797
logging: *logging
98-
image: redis:8.0-M01
98+
image: redis:8.0-M02
9999
ports:
100100
- 8109:6379
101101
networks:

‎tests/e2e/tests/web/critical-path/tree-view/delimiter.e2e.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BrowserPage } from '../../../../pageObjects';
2-
import { commonUrl, ossStandaloneBigConfig, ossStandaloneV8Config } from '../../../../helpers/conf';
2+
import { commonUrl, ossStandaloneBigConfig, ossStandaloneV6Config } from '../../../../helpers/conf';
33
import { rte } from '../../../../helpers/constants';
44
import { DatabaseHelper } from '../../../../helpers/database';
55
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
@@ -48,7 +48,7 @@ test('Verify that user can see that input is not saved when the Cancel button is
4848
});
4949
test
5050
.before(async () => {
51-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
51+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
5252
keyNames = [
5353
`device:common-dev`,
5454
`device-common:dev`,
@@ -71,16 +71,16 @@ test
7171
}
7272
await apiKeyRequests.addHashKeyApi(
7373
hashKeyParameters,
74-
ossStandaloneV8Config,
74+
ossStandaloneV6Config,
7575
)
7676
}
7777
await browserPage.reloadPage();
7878
})
7979
.after(async () => {
8080
for (const keyName of keyNames) {
81-
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
81+
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
8282
}
83-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
83+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
8484
})('Verify that user can set multiple delimiters in the tree view', async t => {
8585
// Switch to tree view
8686
await t.click(browserPage.treeViewButton);

‎tests/e2e/tests/web/regression/browser/format-switcher.e2e.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { keyLength, rte } from '../../../../helpers/constants';
22
import { addKeysViaCli, deleteKeysViaCli, keyTypes } from '../../../../helpers/keys';
33
import { DatabaseHelper } from '../../../../helpers/database';
44
import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
5-
import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
5+
import { commonUrl, ossStandaloneV6Config } from '../../../../helpers/conf';
66
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
77
import { Common } from '../../../../helpers/common';
88

@@ -14,8 +14,8 @@ const databaseAPIRequests = new DatabaseAPIRequests();
1414
const keysData = keyTypes.map(object => ({ ...object }));
1515
keysData.forEach(key => key.keyName = `${key.keyName}` + '-' + `${Common.generateWord(keyLength)}`);
1616
const databasesForAdding = [
17-
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: 'testDB1' },
18-
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: 'testDB2' }
17+
{ host: ossStandaloneV6Config.host, port: ossStandaloneV6Config.port, databaseName: 'testDB1' },
18+
{ host: ossStandaloneV6Config.host, port: ossStandaloneV6Config.port, databaseName: 'testDB2' }
1919
];
2020

2121
fixture `Format switcher functionality`
@@ -25,14 +25,14 @@ fixture `Format switcher functionality`
2525
})
2626
.page(commonUrl)
2727
.beforeEach(async() => {
28-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
28+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
2929
// Create new keys
3030
await addKeysViaCli(keysData);
3131
})
3232
.afterEach(async() => {
3333
// Clear keys and database
3434
await deleteKeysViaCli(keysData);
35-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
35+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
3636
});
3737
test
3838
.before(async() => {

‎tests/e2e/tests/web/regression/browser/formatters.e2e.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { rte } from '../../../../helpers/constants';
2-
import { populateHashWithFields } from '../../../../helpers/keys';
32
import { Common, DatabaseHelper } from '../../../../helpers';
43
import { BrowserPage } from '../../../../pageObjects';
54
import {
65
commonUrl,
7-
ossStandaloneV8Config
6+
ossStandaloneV6Config
87
} from '../../../../helpers/conf';
98
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
109
import { APIKeyRequests } from '../../../../helpers/api/api-keys';
@@ -16,7 +15,6 @@ const databaseHelper = new DatabaseHelper();
1615
const databaseAPIRequests = new DatabaseAPIRequests();
1716

1817
const keyName = `TestHashKey-${ Common.generateWord(10) }`;
19-
const keyToAddParameters = { fieldsCount: 1, keyName, fieldStartWith: 'hashField', fieldValueStartWith: 'hashValue' };
2018

2119
fixture `Formatters`
2220
.meta({
@@ -25,13 +23,13 @@ fixture `Formatters`
2523
})
2624
.page(commonUrl)
2725
.beforeEach(async() => {
28-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
26+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
2927

3028
})
3129
.afterEach(async() => {
3230
// Clear keys and database
33-
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
34-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
31+
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
32+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
3533
});
3634

3735
test('Verify that UTF8 in PHP serialized', async t => {

‎tests/e2e/tests/web/regression/browser/key-messages.e2e.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { rte } from '../../../../helpers/constants';
22
import { DatabaseHelper } from '../../../../helpers/database';
33
import { BrowserPage, MyRedisDatabasePage, WorkbenchPage } from '../../../../pageObjects';
4-
import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
4+
import { commonUrl, ossStandaloneV6Config } from '../../../../helpers/conf';
55
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
66
import { Common } from '../../../../helpers/common';
77
import { APIKeyRequests } from '../../../../helpers/api/api-keys';
@@ -23,10 +23,10 @@ fixture `Key messages`
2323
.meta({ type: 'regression', rte: rte.standalone })
2424
.page(commonUrl)
2525
.beforeEach(async() => {
26-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
26+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
2727
})
2828
.afterEach(async() => {
29-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
29+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
3030
});
3131
test('Verify that user can see updated message in Browser for TimeSeries and Graph data types', async t => {
3232
for(let i = 0; i < dataTypes.length; i++) {
@@ -49,7 +49,7 @@ test('Verify that user can see updated message in Browser for TimeSeries and Gra
4949
for(const message of messages) {
5050
await t.expect(browserPage.modulesTypeDetails.textContent).contains(message, `The message for ${dataTypes[i]} key is not displayed`);
5151
}
52-
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
52+
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
5353
}
5454
});
5555
test('Verify that user can see link to Workbench under word “Workbench” in the RedisTimeSeries and Graph key details', async t => {
@@ -68,6 +68,6 @@ test('Verify that user can see link to Workbench under word “Workbench” in t
6868
await t.click(browserPage.internalLinkToWorkbench);
6969
await t.expect(workbenchPage.queryInput.visible).ok(`The message for ${dataTypes[i]} key is not displayed`);
7070
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
71-
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
71+
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
7272
}
7373
});

‎tests/e2e/tests/web/regression/browser/list-key.e2e.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DatabaseHelper } from '../../../../helpers/database';
33
import { BrowserPage } from '../../../../pageObjects';
44
import {
55
commonUrl,
6-
ossStandaloneV8Config,
6+
ossStandaloneV6Config,
77
} from '../../../../helpers/conf';
88
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
99
import { populateListWithElements } from '../../../../helpers/keys';
@@ -17,7 +17,7 @@ const databaseAPIRequests = new DatabaseAPIRequests();
1717
const apiKeyRequests = new APIKeyRequests();
1818
const telemetry = new Telemetry();
1919

20-
const dbParameters = { host: ossStandaloneV8Config.host, port: ossStandaloneV8Config.port };
20+
const dbParameters = { host: ossStandaloneV6Config.host, port: ossStandaloneV6Config.port };
2121
const keyName = `TestListKey-${ Common.generateWord(10) }`;
2222
const elementForSearch = `SearchField-${ Common.generateWord(5) }`;
2323
const keyToAddParameters = { elementsCount: 500000, keyName, elementStartWith: 'listElement' };
@@ -34,12 +34,12 @@ fixture `List Key verification`
3434
.meta({ type: 'regression', rte: rte.standalone })
3535
.page(commonUrl)
3636
.beforeEach(async() => {
37-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
37+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
3838
await browserPage.addListKey(keyName, '2147476121', ['testElement']);
3939
})
4040
.afterEach(async() => {
41-
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
42-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
41+
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
42+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
4343
});
4444
test.requestHooks(logger)
4545
('Verify that user can search per exact element index in List key in DB with 1 million of fields', async t => {
@@ -63,12 +63,12 @@ test.requestHooks(logger)
6363

6464
test
6565
.before(async() => {
66-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
66+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
6767

6868
})
6969
.after(async() => {
7070
await browserPage.Cli.sendCommandInCli('flushdb');
71-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
71+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
7272
})
7373
('Verify that user can add a multiple fields', async t => {
7474

‎tests/e2e/tests/web/regression/database/redisstack.e2e.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
44
import {
55
commonUrl,
66
ossStandaloneConfig,
7-
ossStandaloneV8Config
7+
ossStandaloneV6Config,
88
} from '../../../../helpers/conf';
99
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
1010

@@ -21,7 +21,7 @@ fixture `Redis Stack`
2121
.beforeEach(async() => {
2222
// Add new databases using API
2323
await databaseHelper.acceptLicenseTerms();
24-
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
24+
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV6Config);
2525
// Reload Page
2626
await browserPage.reloadPage();
2727
})
@@ -54,7 +54,7 @@ test('Verify that user can see Redis Stack icon in Edit mode near the DB name',
5454
test.before(async() => {
5555
// Add new databases using API
5656
await databaseHelper.acceptLicenseTerms();
57-
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV8Config);
57+
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
5858
// Reload Page
5959
await browserPage.reloadPage();
6060
})('Verify that Redis Stack is not displayed for stack >8', async t => {

‎tests/e2e/tests/web/regression/insights/live-recommendations.e2e.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as path from 'path';
22
import { BrowserPage, MemoryEfficiencyPage, MyRedisDatabasePage, WorkbenchPage } from '../../../../pageObjects';
33
import { ExploreTabs, RecommendationIds, rte } from '../../../../helpers/constants';
44
import { DatabaseHelper } from '../../../../helpers/database';
5-
import { commonUrl, ossStandaloneConfig, ossStandaloneV5Config, ossStandaloneV7Config } from '../../../../helpers/conf';
5+
import { commonUrl, ossStandaloneV6Config, ossStandaloneV5Config, ossStandaloneV7Config } from '../../../../helpers/conf';
66
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
77
import { Common } from '../../../../helpers/common';
88
import { Telemetry } from '../../../../helpers/telemetry';
@@ -49,14 +49,14 @@ fixture `Live Recommendations`
4949
await refreshFeaturesTestData();
5050
await modifyFeaturesConfigJson(featuresConfig);
5151
await updateControlNumber(47.2);
52-
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
52+
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV6Config);
5353
await myRedisDatabasePage.reloadPage();
54-
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
54+
await myRedisDatabasePage.clickOnDBByName(ossStandaloneV6Config.databaseName);
5555
})
5656
.afterEach(async() => {
5757
await refreshFeaturesTestData();
5858
// Delete database
59-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
59+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
6060
});
6161
test
6262
.before(async() => {

‎tests/e2e/tests/web/regression/workbench/workbench-non-auto-guides.e2e.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ test
111111
test('Workbench Silent mode', async t => {
112112
const silentCommandSuccessResultName = `${counter} Command(s) - ${counter} success`;
113113
const silentCommandErrorsResultName = `${counter + 1} Command(s) - ${counter} success, 1 error(s)`;
114-
const errorResult = `"ERR unknown command \`${commands[3]}\`, with args beginning with: "`;
114+
const errorResult = `"ERR unknown command \'${commands[3]}\', with args beginning with: "`;
115115

116116
await workbenchPage.sendMultipleCommandsInWorkbench([parameters[5], commands[0]]);
117117
// Verify that user can see the success command output with header: {number} Command(s) - {number} success

0 commit comments

Comments
 (0)