Skip to content

Commit aa71be3

Browse files
authored
Merge pull request #3506 from RedisInsight/e2e/bugfix/unskip-tests
E2e/bugfix/unskip tests
2 parents d9e0e0e + 1b78eb1 commit aa71be3

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

tests/e2e/helpers/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as path from 'path';
22
import * as fs from 'fs';
3-
import * as archiver from 'archiver';
43
import { ClientFunction, RequestMock, t } from 'testcafe';
54
import { Chance } from 'chance';
65
import { apiUrl, commonUrl } from './conf';
6+
const archiver = require('archiver');
77

88
const chance = new Chance();
99

tests/e2e/pageObjects/workbench-page.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class WorkbenchPage extends InstancePage {
3636
preselectCreateHashIndex = Selector('[data-testid="preselect-Create a hash index"]');
3737
preselectGroupBy = Selector('[data-testid*=preselect-Group]');
3838
preselectButtons = Selector('[data-testid^=preselect-]');
39+
copyBtn = Selector('[data-testid^=copy-btn-]');
3940
reRunCommandButton = Selector('[data-testid=re-run-command]');
4041
preselectManual = Selector('[data-testid=preselect-Manual]');
4142
fullScreenButton = Selector('[data-testid=toggle-full-screen]');

tests/e2e/tests/web/critical-path/memory-efficiency/recommendations.e2e.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { ExploreTabs, RecommendationIds, rte } from '../../../../helpers/constan
33
import { DatabaseHelper } from '../../../../helpers/database';
44
import {
55
commonUrl,
6+
ossSentinelConfig,
67
ossStandaloneBigConfig,
78
ossStandaloneConfig,
89
ossStandaloneV5Config
@@ -90,11 +91,13 @@ test
9091
// skipped due to inability to receive no recommendations for now
9192
test.skip('No recommendations message', async t => {
9293
keyName = `recomKey-${Common.generateWord(10)}`;
93-
const noRecommendationsMessage = 'No recommendations at the moment, run a new report later to keep up the good work!';
94+
const noRecommendationsMessage = 'No Tips at the moment,keep up the good work!';
9495
const command = `HSET ${keyName} field value`;
9596

9697
// Create Hash key and create report
9798
await browserPage.Cli.sendCommandInCli(command);
99+
// Go to Analysis Tools page
100+
await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
98101
await t.click(memoryEfficiencyPage.newReportBtn);
99102
// Go to Recommendations tab
100103
await t.click(memoryEfficiencyPage.recommendationsTab);
@@ -159,7 +162,7 @@ test
159162
await recommendationsActions.voteForRecommendation(redisVersionRecommendation, usefulVoteOption);
160163
await recommendationsActions.verifyVoteIsSelected(redisVersionRecommendation, usefulVoteOption);
161164
});
162-
test.skip
165+
test
163166
.before(async t => {
164167
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
165168
keyName = `recomKey-${Common.generateWord(10)}`;
@@ -190,7 +193,6 @@ test.skip
190193
// Verify that tutorial opened
191194
await t.click(memoryEfficiencyPage.getToTutorialBtnByRecomName(searchJsonRecommendation));
192195
await workbenchPage.InsightsPanel.togglePanel(true);
193-
await t.expect(await workbenchPage.InsightsPanel.getActiveTabName()).eql(ExploreTabs.Tutorials);
194196
const tutorial = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
195197
await t.expect(tutorial.preselectArea.visible).ok('Workbench Enablement area not opened');
196198
// Verify that REDIS FOR TIME SERIES tutorial expanded

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ test
120120
.notOk(`${tutorialName} tutorial is not uploaded`);
121121
});
122122
// https://redislabs.atlassian.net/browse/RI-4186, https://redislabs.atlassian.net/browse/RI-4213, https://redislabs.atlassian.net/browse/RI-4302
123-
// skipped because need to move .zip tutorial to another github repository
124-
test.skip
123+
test
125124
.after(async() => {
126125
tutorialName = 'Tutorials with manifest';
127126
const tutorials = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
@@ -130,8 +129,8 @@ test.skip
130129
}
131130
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
132131
})('Verify that user can upload tutorial with URL with manifest.json', async t => {
133-
const labelFromManifest = 'LabelFromManifest';
134-
const link = 'https://github.com/RedisInsight/RedisInsight/raw/main/tests/e2e/test-data/upload-tutorials/TutorialsWithManifest.zip';
132+
const labelFromManifest = 'Working with JSON label';
133+
const link = 'https://github.com/RedisInsight/RedisInsight/raw/9155d0241f6937c213893a29fe24c2f560cd48f3/tests/e2e/test-data/upload-tutorials/TutorialsWithManifest.zip';
135134
internalLinkName1 = 'manifest-id';
136135
tutorialName = 'Tutorials with manifest';
137136
const summary = 'Summary for JSON';

tests/e2e/tests/web/regression/monitor/monitor.e2e.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ test
115115
await t.expect(previousTimestamp).notEql(nextTimestamp, 'Monitor results not correct');
116116
}
117117
});
118-
// Skipped due to redis issue https://redislabs.atlassian.net/browse/RI-4111
119-
test.skip
118+
test
120119
.before(async t => {
121120
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
122121
await browserPage.Cli.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor -client');

tests/e2e/tests/web/regression/workbench/command-results.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test('Verify that user can switches between Table and Text for FT.AGGREGATE and
7171
await t.expect(workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.AGGREGATE');
7272
});
7373
// Skipped due to issue https://redislabs.atlassian.net/browse/RI-3524
74-
test.skip('Verify that user can switches between views and see results according to this view in full mode in Workbench', async t => {
74+
test('Verify that user can switches between views and see results according to this view in full mode in Workbench', async t => {
7575
const command = 'CLIENT LIST';
7676

7777
// Send command and check table view is default in full mode

tests/e2e/tests/web/regression/workbench/default-scripts-area.e2e.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,26 @@ test('Verify that user can see saved article in Enablement area when he leaves W
8282
selector = tutorials.getRunSelector('Create a hash');
8383
await t.expect(selector.visible).ok('The end of the page is not visible');
8484
});
85-
//skipped due the issue RI-2384
86-
test.skip('Verify that user can see saved scroll position in Enablement area when he leaves Workbench page and goes back again', async t => {
85+
test('Verify that user can see saved scroll position in Enablement area when he leaves Workbench page and goes back again', async t => {
8786
// Open Working with Hashes section
8887
await workbenchPage.InsightsPanel.togglePanel(true);
8988
const tutorials = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
9089
await t.click(tutorials.dataStructureAccordionTutorialButton);
9190
await t.click(tutorials.internalLinkWorkingWithHashes);
9291
// Evaluate the last button in Enablement Area
93-
const buttonsQuantity = await workbenchPage.preselectButtons.count;
94-
const lastButton = workbenchPage.preselectButtons.nth(buttonsQuantity - 1);
92+
const buttonsQuantity = await workbenchPage.copyBtn.count;
93+
const lastButton = workbenchPage.copyBtn.nth(buttonsQuantity - 1);
9594
// Scroll to the very bottom of the page
9695
await t.scrollIntoView(lastButton);
96+
await workbenchPage.InsightsPanel.togglePanel(false);
97+
await workbenchPage.InsightsPanel.togglePanel(true);
9798
// Check the scroll position
9899
const scrollPosition = await workbenchPage.scrolledEnablementArea.scrollTop;
99-
// Go to Browser page
100-
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
101-
// Go back to Workbench page
102-
await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
103100
// Check that scroll position is saved
104101
await t.expect(await workbenchPage.scrolledEnablementArea.scrollTop).eql(scrollPosition, 'The scroll position status is incorrect');
105102
// Go to list of DBs page
106103
await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
104+
await t.wait(1000)
107105
// Go back to active DB again
108106
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
109107
// Check that scroll position is saved

0 commit comments

Comments
 (0)