Skip to content

Commit d623277

Browse files
elenaNabokoelenaNaboko
authored
Merge pull request #544 from RedisInsight/bugfix/e2e
Bugfix/e2e
2 parents adb27c4 + e9a33f2 commit d623277

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

‎tests/e2e/helpers/conf.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ export const cloudDatabaseConfig = {
7575
};
7676

7777
export const ossStandaloneNoPermissionsConfig = {
78-
host: process.env.OSS_STANDALONE_BIG_HOST || 'oss-standalone',
79-
port: process.env.OSS_STANDALONE_BIG_PORT || '6379',
80-
databaseName: `${process.env.OSS_STANDALONE_BIG_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`,
81-
databaseUsername: process.env.OSS_STANDALONE_BIG_USERNAME || 'noperm',
82-
databasePassword: process.env.OSS_STANDALONE_BIG_PASSWORD
78+
host: process.env.OSS_STANDALONE_HOST || 'oss-standalone',
79+
port: process.env.OSS_STANDALONE_PORT = '6379' || '6379',
80+
databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`,
81+
databaseUsername: process.env.OSS_STANDALONE_USERNAME || 'noperm',
82+
databasePassword: process.env.OSS_STANDALONE_PASSWORD
8383
};

‎tests/e2e/tests/critical-path/a-first-start-form/autodiscovery.e2e.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ fixture `Autodiscovery`
1515
.beforeEach(async() => {
1616
await acceptLicenseTerms();
1717
})
18-
test
18+
// Marking as skipped due to the issue on Circle CI https://redislabs.atlassian.net/browse/RI-2691
19+
test.skip
1920
.meta({ env: env.desktop, rte: rte.none })
2021
.after(async() => {
2122
// Delete all auto-discovered databases

‎tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ fixture `CLI Command helper`
3030
.afterEach(async() => {
3131
//Delete database
3232
await deleteDatabase(ossStandaloneConfig.databaseName);
33-
})
33+
});
3434
test
35-
.meta({ rte: rte.standalone })
36-
('Verify that user can open/close CLI separately from Command Helper', async t => {
35+
.meta({ rte: rte.standalone })('Verify that user can open/close CLI separately from Command Helper', async t => {
3736
//Open CLI
3837
await t.click(cliPage.cliExpandButton);
3938
//Verify that CLI is opened separately
@@ -47,8 +46,7 @@ test
4746
await t.expect(cliPage.cliCollapseButton.visible).notOk('CLI is closed');
4847
});
4948
test
50-
.meta({ rte: rte.standalone })
51-
('Verify that user can open/close Command Helper separately from CLI', async t => {
49+
.meta({ rte: rte.standalone })('Verify that user can open/close Command Helper separately from CLI', async t => {
5250
//Open Command Helper
5351
await t.click(cliPage.expandCommandHelperButton);
5452
//Verify that Command Helper is opened separately
@@ -62,8 +60,7 @@ test
6260
await t.expect(cliPage.cliCollapseButton.visible).ok('CLI is opended');
6361
});
6462
test
65-
.meta({ rte: rte.standalone })
66-
('Verify that user can see that Command Helper is minimized when he clicks the "minimize" button', async t => {
63+
.meta({ rte: rte.standalone })('Verify that user can see that Command Helper is minimized when he clicks the "minimize" button', async t => {
6764
const helperColourBefore = await common.getBackgroundColour(cliPage.commandHelperBadge);
6865
//Open Command Helper and minimize
6966
await t.click(cliPage.expandCommandHelperButton);
@@ -74,8 +71,7 @@ test
7471
await t.expect(cliPage.minimizeCliButton.visible).eql(false, 'Command helper is mimized');
7572
});
7673
test
77-
.meta({ rte: rte.standalone })
78-
('Verify that user can see that Command Helper displays the previous information when he re-opens it', async t => {
74+
.meta({ rte: rte.standalone })('Verify that user can see that Command Helper displays the previous information when he re-opens it', async t => {
7975
filteringGroup = 'Search';
8076
commandToCheck = 'FT.EXPLAIN';
8177
//Open Command Helper
@@ -90,8 +86,7 @@ test
9086
await t.expect(cliPage.cliHelperTitleArgs.textContent).contains(commandToCheck, 'Command Helper information persists after reopening');
9187
});
9288
test
93-
.meta({ env: env.web, rte: rte.standalone })
94-
('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 => {
89+
.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 => {
9590
filteringGroup = 'JSON';
9691
commandToCheck = 'JSON.SET';
9792
commandArgumentsToCheck = 'JSON.SET key path value [NX|XX]';
@@ -110,8 +105,7 @@ test
110105
await t.switchToParentWindow();
111106
});
112107
test
113-
.meta({ env: env.web, rte: rte.standalone })
114-
('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 => {
108+
.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 => {
115109
filteringGroup = 'Search';
116110
commandToCheck = 'FT.EXPLAIN';
117111
commandArgumentsToCheck = 'FT.EXPLAIN index query [dialect]';
@@ -130,8 +124,7 @@ test
130124
await t.switchToParentWindow();
131125
});
132126
test
133-
.meta({ env: env.web, rte: rte.standalone })
134-
('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => {
127+
.meta({ env: env.web, rte: rte.standalone })('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => {
135128
filteringGroup = 'HyperLogLog';
136129
commandToCheck = 'PFCOUNT';
137130
commandArgumentsToCheck = 'PFCOUNT key [key ...]';
@@ -150,8 +143,7 @@ test
150143
await t.switchToParentWindow();
151144
});
152145
test
153-
.meta({ env: env.web, rte: rte.standalone })
154-
('Verify that user can see all separated groups for AI json file (model, tensor, inference, script)', async t => {
146+
.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 => {
155147
filteringGroups = ['Model', 'Script', 'Inference', 'Tensor'];
156148
commandsToCheck = [
157149
'AI.MODELDEL',
@@ -191,8 +183,7 @@ test
191183
}
192184
});
193185
test
194-
.meta({ env: env.web, rte: rte.standalone })
195-
('Verify that user can work with Gears group in Command Helper (RedisGears module)', async t => {
186+
.meta({ env: env.web, rte: rte.standalone })('Verify that user can work with Gears group in Command Helper (RedisGears module)', async t => {
196187
filteringGroup = 'Gears';
197188
commandToCheck = 'RG.GETEXECUTION';
198189
commandArgumentsToCheck = 'RG.GETEXECUTION id [SHARD|CLUSTER]';
@@ -213,8 +204,7 @@ test
213204
await t.closeWindow();
214205
});
215206
test
216-
.meta({ env: env.web, rte: rte.standalone })
217-
('Verify that user can work with Bloom groups in Command Helper (RedisBloom module)', async t => {
207+
.meta({ env: env.web, rte: rte.standalone })('Verify that user can work with Bloom groups in Command Helper (RedisBloom module)', async t => {
218208
filteringGroups = ['Bf', 'CMS', 'TDigest', 'TopK', 'Cf'];
219209
commandsToCheck = [
220210
'BF.MEXISTS',
@@ -227,7 +217,7 @@ test
227217
'BF.MEXISTS key item [item ...]',
228218
'CMS.QUERY key item [item ...]',
229219
'TDIGEST.RESET key',
230-
'TOPK.LIST key numKeys WITHCOUNT',
220+
'TOPK.LIST key numKeys withcount',
231221
'CF.ADD key item'
232222
];
233223
externalPageLinks = [

‎tests/e2e/tests/regression/monitor/monitor.e2e.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,16 @@ test
116116
test
117117
.meta({ rte: rte.standalone })
118118
.before(async t => {
119+
console.log('Before acceptLicenseTermsAndAddDatabase function');
119120
await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
121+
console.log('After acceptLicenseTermsAndAddDatabase function');
120122
await cliPage.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor');
121123
//Check command result in CLI
122124
await t.click(cliPage.cliExpandButton);
123125
await t.expect(cliPage.cliOutputResponseSuccess.textContent).eql('"OK"', 'Command from autocomplete was found & executed');
124126
await t.click(cliPage.cliCollapseButton);
125127
await deleteDatabase(ossStandaloneConfig.databaseName);
128+
console.log('Before addNewStandaloneDatabase function with no permissions');
126129
await addNewStandaloneDatabase(ossStandaloneNoPermissionsConfig);
127130
await myRedisDatabasePage.clickOnDBByName(ossStandaloneNoPermissionsConfig.databaseName);
128131
})

0 commit comments

Comments
 (0)