Skip to content

Commit 0faf74e

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #3633 from RedisInsight/e2e/bugfix/fix-e2e-in-main
E2e/bugfix/fix e2e in main
2 parents ab2f58c + 26b5dfa commit 0faf74e

File tree

4 files changed

+62
-39
lines changed

4 files changed

+62
-39
lines changed

‎tests/e2e/.desktop.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ OSS_STANDALONE_PORT=8100
99
OSS_STANDALONE_V5_HOST=localhost
1010
OSS_STANDALONE_V5_PORT=8101
1111

12+
OSS_STANDALONE_V7_HOST=localhost
13+
OSS_STANDALONE_V7_PORT=8108
14+
1215
OSS_STANDALONE_REDISEARCH_HOST=localhost
1316
OSS_STANDALONE_REDISEARCH_PORT=8102
1417

‎tests/e2e/helpers/conf.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ export const ossStandaloneV5Config = {
3939
databasePassword: process.env.OSS_STANDALONE_V5_PASSWORD
4040
};
4141

42+
export const ossStandaloneV7Config = {
43+
host: process.env.OSS_STANDALONE_V7_HOST || 'oss-standalone-v7',
44+
port: process.env.OSS_STANDALONE_V7_PORT || '6379',
45+
databaseName: `${process.env.OSS_STANDALONE_V7_DATABASE_NAME || 'test_standalone-v7'}-${uniqueId}`,
46+
databaseUsername: process.env.OSS_STANDALONE_V7_USERNAME,
47+
databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD
48+
};
49+
4250
export const ossStandaloneRedisearch = {
4351
host: process.env.OSS_STANDALONE_REDISEARCH_HOST || 'oss-standalone-redisearch',
4452
port: process.env.OSS_STANDALONE_REDISEARCH_PORT || '6379',

‎tests/e2e/rte.docker-compose.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ services:
7979
ipv4_address: 172.31.100.111
8080
ssh:
8181
ipv4_address: 172.33.100.111
82+
83+
# oss standalone v7
84+
oss-standalone-v7:
85+
logging: *logging
86+
image: redis:7.4-rc2
87+
ports:
88+
- 8108:6379
89+
networks:
90+
default:
91+
ipv4_address: 172.31.100.112
92+
ssh:
93+
ipv4_address: 172.33.100.112
94+
8295
# oss standalone redisearch
8396
oss-standalone-redisearch:
8497
logging: *logging

‎tests/e2e/tests/web/regression/insights/live-recommendations.e2e.ts‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as path from 'path';
22
import { BrowserPage, MemoryEfficiencyPage, MyRedisDatabasePage, WorkbenchPage } from '../../../../pageObjects';
33
import { ExploreTabs, RecommendationIds, rte } from '../../../../helpers/constants';
44
import { DatabaseHelper } from '../../../../helpers/database';
5-
import { commonUrl, ossStandaloneConfig, ossStandaloneV5Config } from '../../../../helpers/conf';
5+
import { commonUrl, ossStandaloneConfig, ossStandaloneV5Config, ossStandaloneV7Config } from '../../../../helpers/conf';
66
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
77
import { Common } from '../../../../helpers/common';
88
import { Telemetry } from '../../../../helpers/telemetry';
@@ -22,7 +22,7 @@ const apiKeyRequests = new APIKeyRequests();
2222

2323
const databasesForAdding = [
2424
{ host: ossStandaloneV5Config.host, port: ossStandaloneV5Config.port, databaseName: ossStandaloneV5Config.databaseName },
25-
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: ossStandaloneConfig.databaseName }
25+
{ host: ossStandaloneV7Config.host, port: ossStandaloneV7Config.port, databaseName: ossStandaloneV7Config.databaseName }
2626
];
2727
const tenSecondsTimeout = 10000;
2828
const keyName = `recomKey-${Common.generateWord(10)}`;
@@ -206,56 +206,55 @@ test('Verify that user can snooze recommendation', async t => {
206206
tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
207207
await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).visible).ok('recommendation is not displayed again');
208208
});
209+
test('Verify that recommendations from database analysis are displayed in Insight panel above live recommendations', async t => {
210+
await browserPage.InsightsPanel.togglePanel(true);
211+
let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
212+
const redisVersionRecommendationSelector = tab.getRecommendationByName(redisVersionRecom);
213+
// Verify that live recommendation displayed in Insights panel
214+
await t.expect(await tab.getRecommendationByName(redisVersionRecom).visible).ok(`${redisVersionRecom} recommendation not displayed`);
215+
// Verify that recommendation from db analysis not displayed in Insights panel
216+
await t.expect(await tab.getRecommendationByName(setPasswordRecom).visible).notOk(`${setPasswordRecom} recommendation displayed`);
217+
await browserPage.InsightsPanel.togglePanel(false);
218+
// Go to Analysis Tools page
219+
await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
220+
await t.click(memoryEfficiencyPage.newReportBtn);
221+
await browserPage.InsightsPanel.togglePanel(true);
222+
tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
223+
// Verify that recommendations are synchronized
224+
await t.expect(await tab.getRecommendationByName(setPasswordRecom).visible).ok('Recommendations are not synchronized');
225+
// Verify that duplicates are not displayed
226+
await t.expect(redisVersionRecommendationSelector.count).eql(1, `${redisVersionRecom} recommendation duplicated`);
227+
});
228+
//https://redislabs.atlassian.net/browse/RI-4413
209229
test
210230
.before(async() => {
211231
await databaseHelper.acceptLicenseTerms();
212232
await refreshFeaturesTestData();
213233
await modifyFeaturesConfigJson(featuresConfig);
214234
await updateControlNumber(47.2);
215-
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV5Config);
235+
await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV7Config);
216236
await myRedisDatabasePage.reloadPage();
217-
await myRedisDatabasePage.clickOnDBByName(ossStandaloneV5Config.databaseName);
237+
await myRedisDatabasePage.clickOnDBByName(ossStandaloneV7Config.databaseName);
218238
}).after(async() => {
219-
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV5Config);
239+
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV7Config);
220240
await refreshFeaturesTestData();
221-
})('Verify that recommendations from database analysis are displayed in Insight panel above live recommendations', async t => {
222-
241+
})('Verify that if user clicks on the Analyze button and link, the pop up with analyze button is displayed and new report is generated', async t => {
223242
await browserPage.InsightsPanel.togglePanel(true);
224243
let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
225-
const redisVersionRecommendationSelector = tab.getRecommendationByName(redisVersionRecom);
226-
// Verify that live recommendation displayed in Insights panel
227-
await t.expect(await tab.getRecommendationByName(redisVersionRecom).visible).ok(`${redisVersionRecom} recommendation not displayed`);
228-
// Verify that recommendation from db analysis not displayed in Insights panel
229-
await t.expect(await tab.getRecommendationByName(setPasswordRecom).visible).notOk(`${setPasswordRecom} recommendation displayed`);
230-
await browserPage.InsightsPanel.togglePanel(false);
231-
// Go to Analysis Tools page
232-
await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
233-
await t.click(memoryEfficiencyPage.newReportBtn);
234-
await browserPage.InsightsPanel.togglePanel(true);
244+
await t.click(tab.analyzeDatabaseButton);
245+
await t.click(tab.analyzeTooltipButton);
246+
//Verify that user is navigated to DB Analysis page via Analyze button and new report is generated
247+
await t.click(memoryEfficiencyPage.selectedReport);
248+
await t.expect(memoryEfficiencyPage.reportItem.visible).ok('Database analysis page not opened');
249+
await t.click(memoryEfficiencyPage.NavigationPanel.workbenchButton);
250+
await workbenchPage.InsightsPanel.togglePanel(true);
235251
tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
236-
// Verify that recommendations are synchronized
237-
await t.expect(await tab.getRecommendationByName(setPasswordRecom).visible).ok('Recommendations are not synchronized');
238-
// Verify that duplicates are not displayed
239-
await t.expect(redisVersionRecommendationSelector.count).eql(1, `${redisVersionRecom} recommendation duplicated`);
252+
await t.click(tab.analyzeDatabaseLink);
253+
await t.click(tab.analyzeTooltipButton);
254+
//Verify that user is navigated to DB Analysis page via Analyze link and new report is generated
255+
await t.click(memoryEfficiencyPage.selectedReport);
256+
await t.expect(memoryEfficiencyPage.reportItem.count).eql(2, 'report was not generated');
240257
});
241-
//https://redislabs.atlassian.net/browse/RI-4413
242-
test('Verify that if user clicks on the Analyze button and link, the pop up with analyze button is displayed and new report is generated', async t => {
243-
await browserPage.InsightsPanel.togglePanel(true);
244-
let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
245-
await t.click(tab.analyzeDatabaseButton);
246-
await t.click(tab.analyzeTooltipButton);
247-
//Verify that user is navigated to DB Analysis page via Analyze button and new report is generated
248-
await t.click(memoryEfficiencyPage.selectedReport);
249-
await t.expect(memoryEfficiencyPage.reportItem.visible).ok('Database analysis page not opened');
250-
await t.click(memoryEfficiencyPage.NavigationPanel.workbenchButton);
251-
await workbenchPage.InsightsPanel.togglePanel(true);
252-
tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
253-
await t.click(tab.analyzeDatabaseLink);
254-
await t.click(tab.analyzeTooltipButton);
255-
//Verify that user is navigated to DB Analysis page via Analyze link and new report is generated
256-
await t.click(memoryEfficiencyPage.selectedReport);
257-
await t.expect(memoryEfficiencyPage.reportItem.count).eql(2, 'report was not generated');
258-
});
259258
//https://redislabs.atlassian.net/browse/RI-4493
260259
test
261260
.after(async() => {

0 commit comments

Comments
 (0)