Skip to content

Bugfix/e2e #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2022
Merged

Bugfix/e2e #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba61cd1
[E2E] Fix and add logging for desktop tests
elenaNaboko Apr 18, 2022
f97705d
Merge branch 'main' into bugfix/e2e
elenaNaboko Apr 18, 2022
e9a33f2
[E2E] Fix web test
elenaNaboko Apr 18, 2022
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
10 changes: 5 additions & 5 deletions tests/e2e/helpers/conf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ export const cloudDatabaseConfig = {
};

export const ossStandaloneNoPermissionsConfig = {
host: process.env.OSS_STANDALONE_BIG_HOST || 'oss-standalone',
port: process.env.OSS_STANDALONE_BIG_PORT || '6379',
databaseName: `${process.env.OSS_STANDALONE_BIG_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`,
databaseUsername: process.env.OSS_STANDALONE_BIG_USERNAME || 'noperm',
databasePassword: process.env.OSS_STANDALONE_BIG_PASSWORD
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone',
port: process.env.OSS_STANDALONE_PORT = '6379' || '6379',
databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`,
databaseUsername: process.env.OSS_STANDALONE_USERNAME || 'noperm',
databasePassword: process.env.OSS_STANDALONE_PASSWORD
};
3 changes: 2 additions & 1 deletion tests/e2e/tests/critical-path/a-first-start-form/autodiscovery.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ fixture `Autodiscovery`
.beforeEach(async() => {
await acceptLicenseTerms();
})
test
// Marking as skipped due to the issue on Circle CI https://redislabs.atlassian.net/browse/RI-2691
test.skip
.meta({ env: env.desktop, rte: rte.none })
.after(async() => {
// Delete all auto-discovered databases
Expand Down
34 changes: 12 additions & 22 deletions tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ fixture `CLI Command helper`
.afterEach(async() => {
//Delete database
await deleteDatabase(ossStandaloneConfig.databaseName);
})
});
test
.meta({ rte: rte.standalone })
('Verify that user can open/close CLI separately from Command Helper', async t => {
.meta({ rte: rte.standalone })('Verify that user can open/close CLI separately from Command Helper', async t => {
//Open CLI
await t.click(cliPage.cliExpandButton);
//Verify that CLI is opened separately
Expand All @@ -47,8 +46,7 @@ test
await t.expect(cliPage.cliCollapseButton.visible).notOk('CLI is closed');
});
test
.meta({ rte: rte.standalone })
('Verify that user can open/close Command Helper separately from CLI', async t => {
.meta({ rte: rte.standalone })('Verify that user can open/close Command Helper separately from CLI', async t => {
//Open Command Helper
await t.click(cliPage.expandCommandHelperButton);
//Verify that Command Helper is opened separately
Expand All @@ -62,8 +60,7 @@ test
await t.expect(cliPage.cliCollapseButton.visible).ok('CLI is opended');
});
test
.meta({ rte: rte.standalone })
('Verify that user can see that Command Helper is minimized when he clicks the "minimize" button', async t => {
.meta({ rte: rte.standalone })('Verify that user can see that Command Helper is minimized when he clicks the "minimize" button', async t => {
const helperColourBefore = await common.getBackgroundColour(cliPage.commandHelperBadge);
//Open Command Helper and minimize
await t.click(cliPage.expandCommandHelperButton);
Expand All @@ -74,8 +71,7 @@ test
await t.expect(cliPage.minimizeCliButton.visible).eql(false, 'Command helper is mimized');
});
test
.meta({ rte: rte.standalone })
('Verify that user can see that Command Helper displays the previous information when he re-opens it', async t => {
.meta({ rte: rte.standalone })('Verify that user can see that Command Helper displays the previous information when he re-opens it', async t => {
filteringGroup = 'Search';
commandToCheck = 'FT.EXPLAIN';
//Open Command Helper
Expand All @@ -90,8 +86,7 @@ test
await t.expect(cliPage.cliHelperTitleArgs.textContent).contains(commandToCheck, 'Command Helper information persists after reopening');
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can see in Command helper and click on new group "JSON", can choose it and see list of commands in the group', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can see in Command helper and click on new group "JSON", can choose it and see list of commands in the group', async t => {
filteringGroup = 'JSON';
commandToCheck = 'JSON.SET';
commandArgumentsToCheck = 'JSON.SET key path value [NX|XX]';
Expand All @@ -110,8 +105,7 @@ test
await t.switchToParentWindow();
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can see in Command helper and click on new group "Search", can choose it and see list of commands in the group', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can see in Command helper and click on new group "Search", can choose it and see list of commands in the group', async t => {
filteringGroup = 'Search';
commandToCheck = 'FT.EXPLAIN';
commandArgumentsToCheck = 'FT.EXPLAIN index query [dialect]';
Expand All @@ -130,8 +124,7 @@ test
await t.switchToParentWindow();
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => {
filteringGroup = 'HyperLogLog';
commandToCheck = 'PFCOUNT';
commandArgumentsToCheck = 'PFCOUNT key [key ...]';
Expand All @@ -150,8 +143,7 @@ test
await t.switchToParentWindow();
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can see all separated groups for AI json file (model, tensor, inference, script)', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can see all separated groups for AI json file (model, tensor, inference, script)', async t => {
filteringGroups = ['Model', 'Script', 'Inference', 'Tensor'];
commandsToCheck = [
'AI.MODELDEL',
Expand Down Expand Up @@ -191,8 +183,7 @@ test
}
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can work with Gears group in Command Helper (RedisGears module)', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can work with Gears group in Command Helper (RedisGears module)', async t => {
filteringGroup = 'Gears';
commandToCheck = 'RG.GETEXECUTION';
commandArgumentsToCheck = 'RG.GETEXECUTION id [SHARD|CLUSTER]';
Expand All @@ -213,8 +204,7 @@ test
await t.closeWindow();
});
test
.meta({ env: env.web, rte: rte.standalone })
('Verify that user can work with Bloom groups in Command Helper (RedisBloom module)', async t => {
.meta({ env: env.web, rte: rte.standalone })('Verify that user can work with Bloom groups in Command Helper (RedisBloom module)', async t => {
filteringGroups = ['Bf', 'CMS', 'TDigest', 'TopK', 'Cf'];
commandsToCheck = [
'BF.MEXISTS',
Expand All @@ -227,7 +217,7 @@ test
'BF.MEXISTS key item [item ...]',
'CMS.QUERY key item [item ...]',
'TDIGEST.RESET key',
'TOPK.LIST key numKeys WITHCOUNT',
'TOPK.LIST key numKeys withcount',
'CF.ADD key item'
];
externalPageLinks = [
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/tests/regression/monitor/monitor.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,16 @@ test
test
.meta({ rte: rte.standalone })
.before(async t => {
console.log('Before acceptLicenseTermsAndAddDatabase function');
await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
console.log('After acceptLicenseTermsAndAddDatabase function');
await cliPage.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor');
//Check command result in CLI
await t.click(cliPage.cliExpandButton);
await t.expect(cliPage.cliOutputResponseSuccess.textContent).eql('"OK"', 'Command from autocomplete was found & executed');
await t.click(cliPage.cliCollapseButton);
await deleteDatabase(ossStandaloneConfig.databaseName);
console.log('Before addNewStandaloneDatabase function with no permissions');
await addNewStandaloneDatabase(ossStandaloneNoPermissionsConfig);
await myRedisDatabasePage.clickOnDBByName(ossStandaloneNoPermissionsConfig.databaseName);
})
Expand Down