Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/e2e/helpers/conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const fileDownloadPath = joinPath(os.homedir(), 'Downloads');
const uniqueId = chance.string({ length: 10 });

export const ossStandaloneConfig = {
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone',
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone-v8',
port: process.env.OSS_STANDALONE_PORT || '6379',
databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'test_standalone'}-${uniqueId}`,
databaseUsername: process.env.OSS_STANDALONE_USERNAME,
Expand Down Expand Up @@ -49,10 +49,10 @@ export const ossStandaloneV7Config = {
databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD
};

export const ossStandaloneV8Config = {
host: process.env.OSS_STANDALONE_V8_HOST || 'oss-standalone-v8',
export const ossStandaloneV6Config = {
host: process.env.OSS_STANDALONE_V8_HOST || 'oss-standalone',
port: process.env.OSS_STANDALONE_V8_PORT || '6379',
databaseName: `${process.env.OSS_STANDALONE_V8_DATABASE_NAME || 'test_standalone-v8'}-${uniqueId}`,
databaseName: `${process.env.OSS_STANDALONE_V8_DATABASE_NAME || 'test_standalone-v6'}-${uniqueId}`,
databaseUsername: process.env.OSS_STANDALONE_V8_USERNAME,
databasePassword: process.env.OSS_STANDALONE_V8_PASSWORD
};
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/rte.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ services:
# oss standalone v8
oss-standalone-v8:
logging: *logging
image: redis:8.0-M01
image: redis:8.0-M02
ports:
- 8109:6379
networks:
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/tests/web/critical-path/tree-view/delimiter.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BrowserPage } from '../../../../pageObjects';
import { commonUrl, ossStandaloneBigConfig, ossStandaloneV8Config } from '../../../../helpers/conf';
import { commonUrl, ossStandaloneBigConfig, ossStandaloneV6Config } from '../../../../helpers/conf';
import { rte } from '../../../../helpers/constants';
import { DatabaseHelper } from '../../../../helpers/database';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
Expand Down Expand Up @@ -48,7 +48,7 @@ test('Verify that user can see that input is not saved when the Cancel button is
});
test
.before(async () => {
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
keyNames = [
`device:common-dev`,
`device-common:dev`,
Expand All @@ -71,16 +71,16 @@ test
}
await apiKeyRequests.addHashKeyApi(
hashKeyParameters,
ossStandaloneV8Config,
ossStandaloneV6Config,
)
}
await browserPage.reloadPage();
})
.after(async () => {
for (const keyName of keyNames) {
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
}
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
})('Verify that user can set multiple delimiters in the tree view', async t => {
// Switch to tree view
await t.click(browserPage.treeViewButton);
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/tests/web/regression/browser/format-switcher.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { keyLength, rte } from '../../../../helpers/constants';
import { addKeysViaCli, deleteKeysViaCli, keyTypes } from '../../../../helpers/keys';
import { DatabaseHelper } from '../../../../helpers/database';
import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
import { commonUrl, ossStandaloneV6Config } from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { Common } from '../../../../helpers/common';

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

fixture `Format switcher functionality`
Expand All @@ -25,14 +25,14 @@ fixture `Format switcher functionality`
})
.page(commonUrl)
.beforeEach(async() => {
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
// Create new keys
await addKeysViaCli(keysData);
})
.afterEach(async() => {
// Clear keys and database
await deleteKeysViaCli(keysData);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
});
test
.before(async() => {
Expand Down
10 changes: 4 additions & 6 deletions tests/e2e/tests/web/regression/browser/formatters.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { rte } from '../../../../helpers/constants';
import { populateHashWithFields } from '../../../../helpers/keys';
import { Common, DatabaseHelper } from '../../../../helpers';
import { BrowserPage } from '../../../../pageObjects';
import {
commonUrl,
ossStandaloneV8Config
ossStandaloneV6Config
} from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { APIKeyRequests } from '../../../../helpers/api/api-keys';
Expand All @@ -16,7 +15,6 @@ const databaseHelper = new DatabaseHelper();
const databaseAPIRequests = new DatabaseAPIRequests();

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

fixture `Formatters`
.meta({
Expand All @@ -25,13 +23,13 @@ fixture `Formatters`
})
.page(commonUrl)
.beforeEach(async() => {
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);

})
.afterEach(async() => {
// Clear keys and database
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV8Config.databaseName);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
});

test('Verify that UTF8 in PHP serialized', async t => {
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/tests/web/regression/browser/key-messages.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { rte } from '../../../../helpers/constants';
import { DatabaseHelper } from '../../../../helpers/database';
import { BrowserPage, MyRedisDatabasePage, WorkbenchPage } from '../../../../pageObjects';
import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
import { commonUrl, ossStandaloneV6Config } from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { Common } from '../../../../helpers/common';
import { APIKeyRequests } from '../../../../helpers/api/api-keys';
Expand All @@ -23,10 +23,10 @@ fixture `Key messages`
.meta({ type: 'regression', rte: rte.standalone })
.page(commonUrl)
.beforeEach(async() => {
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);
})
.afterEach(async() => {
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
});
test('Verify that user can see updated message in Browser for TimeSeries and Graph data types', async t => {
for(let i = 0; i < dataTypes.length; i++) {
Expand All @@ -49,7 +49,7 @@ test('Verify that user can see updated message in Browser for TimeSeries and Gra
for(const message of messages) {
await t.expect(browserPage.modulesTypeDetails.textContent).contains(message, `The message for ${dataTypes[i]} key is not displayed`);
}
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
}
});
test('Verify that user can see link to Workbench under word “Workbench” in the RedisTimeSeries and Graph key details', async t => {
Expand All @@ -68,6 +68,6 @@ test('Verify that user can see link to Workbench under word “Workbench” in t
await t.click(browserPage.internalLinkToWorkbench);
await t.expect(workbenchPage.queryInput.visible).ok(`The message for ${dataTypes[i]} key is not displayed`);
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV6Config.databaseName);
}
});
14 changes: 7 additions & 7 deletions tests/e2e/tests/web/regression/browser/list-key.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { DatabaseHelper } from '../../../../helpers/database';
import { BrowserPage } from '../../../../pageObjects';
import {
commonUrl,
ossStandaloneV8Config,
ossStandaloneV6Config,
} from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { populateListWithElements } from '../../../../helpers/keys';
Expand All @@ -17,7 +17,7 @@ const databaseAPIRequests = new DatabaseAPIRequests();
const apiKeyRequests = new APIKeyRequests();
const telemetry = new Telemetry();

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

test
.before(async() => {
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV6Config);

})
.after(async() => {
await browserPage.Cli.sendCommandInCli('flushdb');
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV8Config);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
})
('Verify that user can add a multiple fields', async t => {

Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/tests/web/regression/database/redisstack.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
import {
commonUrl,
ossStandaloneConfig,
ossStandaloneV8Config
ossStandaloneV6Config,
} from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';

Expand All @@ -21,7 +21,7 @@ fixture `Redis Stack`
.beforeEach(async() => {
// Add new databases using API
await databaseHelper.acceptLicenseTerms();
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV6Config);
// Reload Page
await browserPage.reloadPage();
})
Expand Down Expand Up @@ -54,7 +54,7 @@ test('Verify that user can see Redis Stack icon in Edit mode near the DB name',
test.before(async() => {
// Add new databases using API
await databaseHelper.acceptLicenseTerms();
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV8Config);
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
// Reload Page
await browserPage.reloadPage();
})('Verify that Redis Stack is not displayed for stack >8', async t => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as path from 'path';
import { BrowserPage, MemoryEfficiencyPage, MyRedisDatabasePage, WorkbenchPage } from '../../../../pageObjects';
import { ExploreTabs, RecommendationIds, rte } from '../../../../helpers/constants';
import { DatabaseHelper } from '../../../../helpers/database';
import { commonUrl, ossStandaloneConfig, ossStandaloneV5Config, ossStandaloneV7Config } from '../../../../helpers/conf';
import { commonUrl, ossStandaloneV6Config, ossStandaloneV5Config, ossStandaloneV7Config } from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { Common } from '../../../../helpers/common';
import { Telemetry } from '../../../../helpers/telemetry';
Expand Down Expand Up @@ -49,14 +49,14 @@ fixture `Live Recommendations`
await refreshFeaturesTestData();
await modifyFeaturesConfigJson(featuresConfig);
await updateControlNumber(47.2);
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV6Config);
await myRedisDatabasePage.reloadPage();
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
await myRedisDatabasePage.clickOnDBByName(ossStandaloneV6Config.databaseName);
})
.afterEach(async() => {
await refreshFeaturesTestData();
// Delete database
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV6Config);
});
test
.before(async() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ test
test('Workbench Silent mode', async t => {
const silentCommandSuccessResultName = `${counter} Command(s) - ${counter} success`;
const silentCommandErrorsResultName = `${counter + 1} Command(s) - ${counter} success, 1 error(s)`;
const errorResult = `"ERR unknown command \`${commands[3]}\`, with args beginning with: "`;
const errorResult = `"ERR unknown command \'${commands[3]}\', with args beginning with: "`;

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