Skip to content

Commit 0a82817

Browse files
Merge pull request #3896 from RedisInsight/e2e/feature/RI-5565
E2e/feature/ri 5565
2 parents d2c545e + a8fe546 commit 0a82817

File tree

10 files changed

+62
-63
lines changed

10 files changed

+62
-63
lines changed

tests/e2e/tests/web/critical-path/browser/bulk-upload.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ test('Verify bulk upload of different text docs formats', async t => {
6161

6262
// Verify that user can remove uploaded file
6363
await t.setFilesToUpload(browserPage.BulkActions.bulkUploadInput, [filePathes.bigDataFile]);
64-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
65-
// await t.expect(browserPage.BulkActions.bulkUploadContainer.textContent).contains(filesToUpload[1], 'Filename not displayed in upload input');
64+
65+
await t.expect(browserPage.BulkActions.bulkUploadContainer.textContent).contains(filesToUpload[1], 'Filename not displayed in upload input');
6666
await t.click(browserPage.BulkActions.removeFileBtn);
6767
await t.expect(browserPage.BulkActions.bulkUploadContainer.textContent).contains(defaultText, 'File not removed from upload input');
6868

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,17 @@ 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.io/try-free';
159-
// const externalPageLinkSecond = '?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_browser_search'
158+
const externalPageLinkFirst = 'https://redis.io/try-free';
159+
const externalPageLinkSecond = '?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_browser_search'
160160

161161
await t.click(browserPage.redisearchModeBtn);
162162
// Verify that user can see message in the dialog when he doesn't have RediSearch module
163163
await t.expect(browserPage.noReadySearchDialogTitle.textContent).contains(noRedisearchMessage, 'Invalid text in no redisearch popover');
164-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
165-
// // Verify that user can navigate by link to create a Redis db
166-
// await t.click(browserPage.redisearchFreeLink);
167-
// await Common.checkURLContainsText(externalPageLinkFirst);
168-
// await Common.checkURLContainsText(externalPageLinkSecond);
164+
165+
// Verify that user can navigate by link to create a Redis db
166+
await t.click(browserPage.redisearchFreeLink);
167+
await Common.checkURLContainsText(externalPageLinkFirst);
168+
await Common.checkURLContainsText(externalPageLinkSecond);
169169
});
170170
test
171171
.before(async() => {
@@ -190,11 +190,11 @@ test
190190
await t.click(browserPage.selectIndexDdn);
191191
await t.click(browserPage.createIndexBtn);
192192
await t.expect(browserPage.newIndexPanel.exists).ok('New Index panel is not displayed');
193-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
194-
// // Verify that user can see a link to create a profound index and navigate
195-
// await t.click(browserPage.newIndexPanel.find('a'));
196-
// await Common.checkURL(createIndexLink);
197-
// await goBackHistory();
193+
194+
// Verify that user can see a link to create a profound index and navigate
195+
await t.click(browserPage.newIndexPanel.find('a'));
196+
await Common.checkURL(createIndexLink);
197+
await goBackHistory();
198198

199199
// Verify that user can create an index with multiple prefixes
200200
// await t.click(browserPage.selectIndexDdn);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +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-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
95-
// await browserPage.CommandHelper.checkURLCommand(timeSeriesCommands[0], `https://redis.io/docs/latest/commands/${timeSeriesCommands[0].toLowerCase()}/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper`);
94+
await browserPage.CommandHelper.checkURLCommand(timeSeriesCommands[0], `https://redis.io/docs/latest/commands/${timeSeriesCommands[0].toLowerCase()}/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_command_helper`);
9695
});
9796
// outdated after https://redislabs.atlassian.net/browse/RI-4608
9897
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/critical-path/database/connecting-to-the-db.e2e.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
66
import { sshPrivateKey, sshPrivateKeyWithPasscode } from '../../../../test-data/sshPrivateKeys';
77
import { Common } from '../../../../helpers/common';
88
import { BrowserActions } from '../../../../common-actions/browser-actions';
9+
import { goBackHistory } from '../../../../helpers/utils';
910

1011
const myRedisDatabasePage = new MyRedisDatabasePage();
1112
const browserPage = new BrowserPage();
@@ -188,16 +189,15 @@ test
188189
await databaseHelper.acceptLicenseTerms();
189190
})('Verify that user can see the No databases message on the empty databases list', async t => {
190191
const noDatabasesMessage = 'No databases yet, let\'s add one!';
191-
// const externalPageLink = 'https://redis.io/try-free/?utm_source=redisinsight&utm_medium=main&utm_campaign=main'
192+
const externalPageLink = 'https://redis.io/try-free?utm_source=redisinsight&utm_medium=main&utm_campaign=empty_db_list'
192193

193194
await t.expect(myRedisDatabasePage.emptyListMessage.withText(noDatabasesMessage).exists).ok('Empty databases list message not displayed');
194195

195196
await t.click(myRedisDatabasePage.addDbFromEmptyListBtn);
196197
await t.expect(myRedisDatabasePage.AddRedisDatabase.testConnectionBtn.exists).ok('Add database form not opened');
197198
await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
198199

199-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
200-
// await t.click(myRedisDatabasePage.emptyDbCloudBtn);
201-
// await Common.checkURL(externalPageLink);
202-
// await goBackHistory();
200+
await t.click(myRedisDatabasePage.emptyDbCloudBtn);
201+
await Common.checkURL(externalPageLink);
202+
await goBackHistory();
203203
});

tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ test.before(async() => {
125125
await t.click(myRedisDatabasePage.Modal.closeModalButton);
126126
await t.click(myRedisDatabasePage.importDatabasesBtn);
127127
await t.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [rdmData.path]);
128-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
129-
// await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
128+
129+
await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(fileNames.rdmFullJson, 'Filename not displayed in import input');
130130
// Click on remove button
131131
await t.click(myRedisDatabasePage.removeImportedFileBtn);
132132
await t.expect(myRedisDatabasePage.importDbDialog.textContent).contains(defaultText, 'File not removed from import input');

tests/e2e/tests/web/regression/browser/survey-link.e2e.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ test('Verify that user can use survey link', async t => {
2626
// Verify that user can see survey link on any page inside of DB
2727
// Browser page
2828
await t.expect(browserPage.userSurveyLink.visible).ok('Survey Link is not displayed');
29-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
30-
// await t.click(browserPage.userSurveyLink);
31-
// // Verify that when users click on RI survey, they are redirected to https://www.surveymonkey.com/r/redisinsight
32-
// await Common.checkURL(externalPageLink);
33-
// await goBackHistory();
29+
30+
await t.click(browserPage.userSurveyLink);
31+
// Verify that when users click on RI survey, they are redirected to https://www.surveymonkey.com/r/redisinsight
32+
await Common.checkURL(externalPageLink);
33+
await goBackHistory();
3434
// Workbench page
3535
await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
3636
await t.expect(browserPage.userSurveyLink.visible).ok('Survey Link is not displayed');

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ test('Verify that user can see in Command helper and click on new group "JSON",
9090
await t.click(browserPage.CommandHelper.cliHelperOutputTitles.withExactText(commandToCheck));
9191
// Verify results of opened command
9292
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandArgumentsToCheck, 'Selected command title not correct');
93-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
94-
// // Click on Read More link for selected command
95-
// await t.click(browserPage.CommandHelper.readMoreButton);
96-
// // Check new opened window page with the correct URL
97-
// await Common.checkURL(externalPageLink);
93+
94+
// Click on Read More link for selected command
95+
await t.click(browserPage.CommandHelper.readMoreButton);
96+
// Check new opened window page with the correct URL
97+
await Common.checkURL(externalPageLink);
9898
});
9999
test('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 => {
100100
filteringGroup = 'Search';
@@ -109,11 +109,11 @@ test('Verify that user can see in Command helper and click on new group "Search"
109109
await t.click(browserPage.CommandHelper.cliHelperOutputTitles.withExactText(commandToCheck));
110110
// Verify results of opened command
111111
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandArgumentsToCheck, 'Selected command title not correct');
112-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
113-
// // Click on Read More link for selected command
114-
// await t.click(browserPage.CommandHelper.readMoreButton);
115-
// // Check new opened window page with the correct URL
116-
// await Common.checkURL(externalPageLink);
112+
113+
// Click on Read More link for selected command
114+
await t.click(browserPage.CommandHelper.readMoreButton);
115+
// Check new opened window page with the correct URL
116+
await Common.checkURL(externalPageLink);
117117
});
118118
test('Verify that user can see HyperLogLog title in Command Helper for this command group', async t => {
119119
filteringGroup = 'HyperLogLog';
@@ -128,11 +128,11 @@ test('Verify that user can see HyperLogLog title in Command Helper for this comm
128128
await t.click(browserPage.CommandHelper.cliHelperOutputTitles.withExactText(commandToCheck));
129129
// Verify results of opened command
130130
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandArgumentsToCheck, 'Selected command title not correct');
131-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
132-
// // Click on Read More link for selected command
133-
// await t.click(browserPage.CommandHelper.readMoreButton);
134-
// // Check new opened window page with the correct URL
135-
// await Common.checkURL(externalPageLink);
131+
132+
// Click on Read More link for selected command
133+
await t.click(browserPage.CommandHelper.readMoreButton);
134+
// Check new opened window page with the correct URL
135+
await Common.checkURL(externalPageLink);
136136
});
137137
test('Verify that user can see all separated groups for AI json file (model, tensor, inference, script)', async t => {
138138
filteringGroups = ['Model', 'Script', 'Inference', 'Tensor'];
@@ -230,14 +230,14 @@ test('Verify that user can work with Bloom groups in Command Helper (RedisBloom
230230
await t.click(browserPage.CommandHelper.cliHelperOutputTitles.withExactText(commandsToCheck[i]));
231231
// Verify results of opened command
232232
await t.expect(browserPage.CommandHelper.cliHelperTitleArgs.textContent).eql(commandsArgumentsToCheck[i], 'Selected command title not correct');
233-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
234-
// // Verify that user can use Read More link for Bloom, Cuckoo, CMS, TDigest, TopK groups in Command Helper (RedisBloom module).
235-
// await t.click(browserPage.CommandHelper.readMoreButton);
236-
// // Check new opened window page with the correct URL
237-
// await Common.checkURL(externalPageLinks[i]);
238-
// // Close the window with external link to switch to the application window
239-
// await goBackHistory();
240-
// await t.click(browserPage.CommandHelper.expandCommandHelperButton);
233+
234+
// Verify that user can use Read More link for Bloom, Cuckoo, CMS, TDigest, TopK groups in Command Helper (RedisBloom module).
235+
await t.click(browserPage.CommandHelper.readMoreButton);
236+
// Check new opened window page with the correct URL
237+
await Common.checkURL(externalPageLinks[i]);
238+
// Close the window with external link to switch to the application window
239+
await goBackHistory();
240+
await t.click(browserPage.CommandHelper.expandCommandHelperButton);
241241
i++;
242242
}
243243
});

tests/e2e/tests/web/regression/database/github.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test('Verify that user can work with Github link in the application', async t =>
3333
await t.expect(myRedisDatabasePage.NavigationPanel.githubButton.visible).ok('Github button');
3434
// Verify that when user clicks on Github icon he redirects to the URL: https://github.com/RedisInsight/RedisInsight
3535
await t.click(myRedisDatabasePage.NavigationPanel.githubButton);
36-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
37-
// await Common.checkURLContainsText('https://github.com/RedisInsight/RedisInsight');
36+
37+
await Common.checkURLContainsText('https://github.com/RedisInsight/RedisInsight');
3838
});

tests/e2e/tests/web/regression/shortcuts/shortcuts.e2e.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ test('Verify that user can see a summary of Shortcuts by clicking "Keyboard Shor
3131
// Verify that user can close the Shortcuts
3232
await t.click(myRedisDatabasePage.ShortcutsPanel.shortcutsCloseButton);
3333
await t.expect(myRedisDatabasePage.ShortcutsPanel.shortcutsPanel.exists).notOk('Shortcuts panel is not displayed');
34-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
35-
// // Click on the Release Notes in Help Center
36-
// await t.click(myRedisDatabasePage.NavigationPanel.helpCenterButton);
37-
// await t.click(myRedisDatabasePage.NavigationPanel.HelpCenter.helpCenterReleaseNotesButton);
38-
// // Verify redirected link opening Release Notes in Help Center
39-
// await Common.checkURL('https://github.com/RedisInsight/RedisInsight/releases');
34+
35+
// Click on the Release Notes in Help Center
36+
await t.click(myRedisDatabasePage.NavigationPanel.helpCenterButton);
37+
await t.click(myRedisDatabasePage.NavigationPanel.HelpCenter.helpCenterReleaseNotesButton);
38+
// Verify redirected link opening Release Notes in Help Center
39+
await Common.checkURL('https://github.com/RedisInsight/RedisInsight/releases');
4040
});
4141
test('Verify that user can see description of the “up” shortcut in the Help Center > Keyboard Shortcuts > Workbench table', async t => {
4242
const description = [

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ test('Verify that user can see the text in settings for pipeline with link', asy
4141

4242
// Verify text in setting for pipeline
4343
await t.expect(settingsPage.accordionWorkbenchSettings.textContent).contains(pipelineText, 'Text is incorrect');
44-
// Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
45-
// await t.click(settingsPage.pipelineLink);
46-
// // Check new opened window page with the correct URL
47-
// await Common.checkURL(externalPageLink);
44+
45+
await t.click(settingsPage.pipelineLink);
46+
// Check new opened window page with the correct URL
47+
await Common.checkURL(externalPageLink);
4848
});
4949
test.skip('Verify that only chosen in pipeline number of commands is loading at the same time in Workbench', async t => {
5050
await settingsPage.changeCommandsInPipeline(pipelineValues[1]);

0 commit comments

Comments
 (0)