Skip to content

Commit 7776f79

Browse files
authored
Merge pull request #3253 from RedisInsight/e2e/bugfix/fixes-links-tests
fixee2e
2 parents fae3175 + cd36b66 commit 7776f79

File tree

8 files changed

+37
-33
lines changed

8 files changed

+37
-33
lines changed

tests/e2e/pageObjects/components/explore-tab.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class ExploreTab {
115115
async waitUntilImageRendered(selector: Selector): Promise<void> {
116116
const searchTimeout = 5 * 1000; // 5 sec maximum wait
117117
const startTime = Date.now();
118-
let imageHeight = await selector.getStyleProperty('height');
118+
let imageHeight;
119119

120120
do {
121121
imageHeight = await selector.getStyleProperty('height');

tests/e2e/tests/web/critical-path/browser/search-capabilities.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ test
155155
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV5Config);
156156
})('No RediSearch module message', async t => {
157157
const noRedisearchMessage = 'RediSearch is not available for this database';
158-
const externalPageLinkFirst = 'https://redis.com/try-free';
158+
const externalPageLinkFirst = 'https://redis.io/try-free';
159159
const externalPageLinkSecond = '?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_browser_search'
160160

161161
await t.click(browserPage.redisearchModeBtn);
@@ -174,7 +174,7 @@ test
174174
await browserPage.Cli.sendCommandInCli(`FT.DROPINDEX ${indexName}`);
175175
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneBigConfig);
176176
})('Index creation', async t => {
177-
const createIndexLink = 'https://redis.io/commands/ft.create/';
177+
const createIndexLink = 'https://redis.io/docs/latest/commands/ft.create/?utm_source=redisinsight&utm_medium=app&utm_campaign=browser_search';
178178

179179
// Verify that user can cancel index creation
180180
await t.click(browserPage.redisearchModeBtn);

tests/e2e/tests/web/critical-path/cli/cli-command-helper.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ test('Verify that user can type TS. in Command helper and see commands from Redi
9191
// Search per part of command and check all opened commands
9292
await browserPage.CommandHelper.checkSearchedCommandInCommandHelper(commandForSearch, timeSeriesCommands);
9393
// Check the first command documentation url
94-
await browserPage.CommandHelper.checkURLCommand(timeSeriesCommands[0], `https://redis.io/commands/${timeSeriesCommands[0].toLowerCase()}/`);
94+
await browserPage.CommandHelper.checkURLCommand(timeSeriesCommands[0], `https://redis.io/latest/commands/${timeSeriesCommands[0].toLowerCase()}/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper`);
9595
});
9696
// outdated after https://redislabs.atlassian.net/browse/RI-4608
9797
test.skip('Verify that user can type GRAPH. in Command helper and see auto-suggestions from RedisGraph commands.json', async t => {

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ test('Verify that user can see in Command helper and click on new group "JSON",
8181
filteringGroup = 'JSON';
8282
commandToCheck = 'JSON.SET';
8383
commandArgumentsToCheck = 'JSON.SET key path value [condition]';
84-
externalPageLink = 'https://redis.io/commands/json.set/';
84+
externalPageLink = 'https://redis.io/latest/commands/json.set/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper';
8585

8686
// Open Command Helper
8787
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
@@ -99,7 +99,7 @@ test('Verify that user can see in Command helper and click on new group "Search"
9999
filteringGroup = 'Search';
100100
commandToCheck = 'FT.EXPLAIN';
101101
commandArgumentsToCheck = 'FT.EXPLAIN index query [dialect]';
102-
externalPageLink = 'https://redis.io/commands/ft.explain/';
102+
externalPageLink = 'https://redis.io/latest/commands/ft.explain/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper';
103103

104104
// Open Command Helper
105105
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
@@ -117,7 +117,7 @@ test('Verify that user can see HyperLogLog title in Command Helper for this comm
117117
filteringGroup = 'HyperLogLog';
118118
commandToCheck = 'PFCOUNT';
119119
commandArgumentsToCheck = 'PFCOUNT key [key ...]';
120-
externalPageLink = 'https://redis.io/commands/pfcount/';
120+
externalPageLink = 'https://redis.io/docs/latest/commands/pfcount/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper';
121121

122122
// Open Command Helper
123123
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
@@ -145,12 +145,12 @@ test('Verify that user can see all separated groups for AI json file (model, ten
145145
'AI.SCRIPTEXECUTE key function [KEYS key_count key [key ...]] [INPUTS input_count input [input ...]] [ARGS arg_count arg [arg ...]] [OUTPUTS output_count output [output ...]] [TIMEOUT timeout]',
146146
'AI.TENSORSET key FLOAT|DOUBLE|INT8|INT16|INT32|INT64|UINT8|UINT16|STRING|BOOL shape [shape ...] [BLOB blob] [VALUES value [VALUES value ...]]'
147147
];
148-
externalPageLinks = [
149-
'https://redis.io/commands/ai.modeldel',
150-
'https://redis.io/commands/ai.scriptstore',
151-
'https://redis.io/commands/ai.scriptexecute',
152-
'https://redis.io/commands/ai.tensorset'
153-
];
148+
// externalPageLinks = [
149+
// 'https://redis.io/commands/ai.modeldel',
150+
// 'https://redis.io/commands/ai.scriptstore',
151+
// 'https://redis.io/commands/ai.scriptexecute',
152+
// 'https://redis.io/commands/ai.tensorset'
153+
// ];
154154

155155
// Open Command Helper
156156
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
@@ -162,21 +162,22 @@ test('Verify that user can see all separated groups for AI json file (model, ten
162162
await t.click(browserPage.CommandHelper.cliHelperOutputTitles.withExactText(commandsToCheck[i]));
163163
// Verify results of opened command
164164
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandsArgumentsToCheck[i], 'Selected command title not correct');
165+
// Currently these links are deleted from redis.io
165166
// Click on Read More link for selected command
166-
await t.click(browserPage.CommandHelper.readMoreButton);
167+
// await t.click(browserPage.CommandHelper.readMoreButton);
167168
// Check new opened window page with the correct URL
168-
await Common.checkURL(externalPageLinks[i]);
169+
// await Common.checkURL(externalPageLinks[i]);
169170
// Close the window with external link to switch to the application window
170-
await goBackHistory();
171-
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
171+
// await goBackHistory();
172+
// await t.click(browserPage.CommandHelper.expandCommandHelperButton);
172173
i++;
173174
}
174175
});
175176
test('Verify that user can work with Gears group in Command Helper (RedisGears module)', async t => {
176177
filteringGroup = 'Gears';
177178
commandToCheck = 'RG.GETEXECUTION';
178179
commandArgumentsToCheck = 'RG.GETEXECUTION id [SHARD|CLUSTER]';
179-
externalPageLink = 'https://redis.io/commands/rg.getexecution';
180+
// externalPageLink = 'https://redis.io/commands/rg.getexecution';
180181

181182
// Open Command Helper
182183
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
@@ -187,9 +188,10 @@ test('Verify that user can work with Gears group in Command Helper (RedisGears m
187188
// Verify results of opened command
188189
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandArgumentsToCheck, 'Selected command title not correct');
189190
// Verify that user can use Read More link for Gears group in Command Helper (RedisGears module)
190-
await t.click(browserPage.CommandHelper.readMoreButton);
191+
// Currently these links are deleted from redis.io
192+
// await t.click(browserPage.CommandHelper.readMoreButton);
191193
// Check new opened window page with the correct URL
192-
await Common.checkURL(externalPageLink);
194+
// await Common.checkURL(externalPageLink);
193195
});
194196
test('Verify that user can work with Bloom groups in Command Helper (RedisBloom module)', async t => {
195197
filteringGroups = ['Bloom Filter', 'CMS', 'TDigest', 'TopK', 'Cuckoo Filter'];
@@ -208,11 +210,11 @@ test('Verify that user can work with Bloom groups in Command Helper (RedisBloom
208210
'CF.ADD key item'
209211
];
210212
externalPageLinks = [
211-
'https://redis.io/commands/bf.mexists/',
212-
'https://redis.io/commands/cms.query/',
213-
'https://redis.io/commands/tdigest.reset/',
214-
'https://redis.io/commands/topk.list/',
215-
'https://redis.io/commands/cf.add/'
213+
'https://redis.io/latest/commands/bf.mexists/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper',
214+
'https://redis.io/latest/commands/cms.query/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper',
215+
'https://redis.io/latest/commands/tdigest.reset/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper',
216+
'https://redis.io/latest/commands/topk.list/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper',
217+
'https://redis.io/latest/commands/cf.add/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper'
216218
];
217219

218220
// Open Command Helper

tests/e2e/tests/web/regression/insights/import-tutorials.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test
6464
})('Verify that user can upload tutorial with local zip file without manifest.json', async t => {
6565
// Verify that user can upload custom tutorials on docker version
6666
internalLinkName1 = 'probably-1';
67-
const imageExternalPath = 'RedisInsight screen external';
67+
const imageExternalPath = 'Redis Insight screen external';
6868

6969
// Verify that user can see the “MY TUTORIALS” section in the Enablement area.
7070
await workbenchPage.InsightsPanel.togglePanel(true);

tests/e2e/tests/web/regression/tree-view/tree-view.e2e.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ fixture `Tree view verifications`
3333
});
3434
test
3535
.before(async() => {
36-
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisearch);
36+
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfigEmpty);
3737
})
3838
.after(async() => {
3939
// Delete database
40-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
40+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfigEmpty);
4141
})('Verify that user has load sample data button when there are no keys in the database', async t => {
4242
const message = 'Let\'sstartworkingLoadsampledata+Addkeymanually';
4343
const actualMessage = await browserPage.keyListMessage.innerText;
@@ -88,9 +88,11 @@ test
8888
test
8989
.before(async() => {
9090
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisGears);
91+
await browserPage.Cli.sendCommandInCli('flushdb');
9192
})
9293
.after(async() => {
9394
// Delete database
95+
await browserPage.Cli.sendCommandInCli('flushdb');
9496
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisGears);
9597
})('Verify that user can load sample data if database does not have modules', async t => {
9698
// Verify the message

tests/e2e/tests/web/regression/workbench/workbench-pipeline.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const settingsPage = new SettingsPage();
1212
const databaseHelper = new DatabaseHelper();
1313
const databaseAPIRequests = new DatabaseAPIRequests();
1414

15-
const externalPageLink = 'https://redis.io/docs/manual/pipelining/';
15+
const externalPageLink = 'https://redis.io/docs/latest/develop/use/pipelining/';
1616
const pipelineValues = ['-5', '5', '4', '20'];
1717
const commandForSend = '100 scan 0 match * count 5000';
1818

tests/e2e/tests/web/smoke/database/add-db-from-welcome-page.e2e.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const databaseAPIRequests = new DatabaseAPIRequests();
1313
const welcomePage = new WelcomePage();
1414

1515
const getPageUrl = ClientFunction(() => window.location.href);
16-
const linuxPage = 'https://redis.io/docs/install/install-stack/linux/?utm_source=redisinsight&utm_medium=main&utm_campaign=linux';
17-
const dockerPage = 'https://redis.io/docs/install/install-stack/docker/?utm_source=redisinsight&utm_medium=main&utm_campaign=docker';
18-
const homebrewPage = 'https://redis.io/docs/install/install-stack/mac-os/?utm_source=redisinsight&utm_medium=main&utm_campaign=homebrew';
19-
const promoPage = 'https://redis.com/try-free/?utm_source=redisinsight&utm_medium=main&utm_campaign=main';
16+
const linuxPage = 'https://redis.io/docs/latest/operate/oss_and_stack/install/install-stack/linux/?utm_source=redisinsight&utm_medium=main&utm_campaign=linux';
17+
const dockerPage = 'https://redis.io/docs/latest/operate/oss_and_stack/install/install-stack/docker/?utm_source=redisinsight&utm_medium=main&utm_campaign=docker';
18+
const homebrewPage = 'https://redis.io/docs/latest/operate/oss_and_stack/install/install-stack/mac-os/?utm_source=redisinsight&utm_medium=main&utm_campaign=homebrew';
19+
const promoPage = 'https://redis.io/try-free/?utm_source=redisinsight&utm_medium=main&utm_campaign=main';
2020

2121
fixture `Add database from welcome page`
2222
.meta({ type: 'smoke', rte: rte.standalone })

0 commit comments

Comments
 (0)