Skip to content

Commit 0b0e443

Browse files
authored
Merge pull request #3748 from RedisInsight/e2e/feature/RI-5950-saml
e2e/feature/RI-5950-saml
2 parents e5cbf19 + 9bb6547 commit 0b0e443

34 files changed

+142
-116
lines changed

tests/e2e/pageObjects/base-overview-page.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ import { RedisOverviewPage } from '../helpers/constants';
33
import { Toast } from './components/common/toast';
44
import { ShortcutsPanel } from './components/shortcuts-panel';
55
import { EditorButton } from './components/common/editorButton';
6+
import { NavigationHeader } from './components/navigation/navigation-header';
7+
import { Modal } from './components/common/modal';
8+
69
export class BaseOverviewPage {
710
ShortcutsPanel = new ShortcutsPanel();
811
Toast = new Toast();
912
EditorButton = new EditorButton();
13+
NavigationHeader = new NavigationHeader();
14+
Modal = new Modal();
1015

1116
notification = Selector('[data-testid^=-notification]');
1217
deleteRowButton = Selector('[data-testid^=delete-instance-]');
@@ -21,6 +26,7 @@ export class BaseOverviewPage {
2126

2227
databasePageLink = Selector('[data-testid=home-tab-databases]');
2328
rdiPageLink = Selector('[data-testid=home-tab-rdi-instances]');
29+
exploreRedisBtn = Selector('[data-testid=explore-redis-btn]');
2430

2531
/**
2632
* Reload page

tests/e2e/pageObjects/base-page.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { NavigationPanel } from './components/navigation-panel';
33
import { Toast } from './components/common/toast';
44
import { ShortcutsPanel } from './components/shortcuts-panel';
55
import { EditorButton } from './components/common/editorButton';
6+
import { Modal } from './components/common/modal';
67

78
export class BasePage {
89
notification = Selector('[data-testid^=-notification]');
@@ -11,6 +12,7 @@ export class BasePage {
1112
ShortcutsPanel = new ShortcutsPanel();
1213
Toast = new Toast();
1314
EditorButton = new EditorButton();
15+
Modal = new Modal();
1416

1517
/**
1618
* Reload page

tests/e2e/pageObjects/browser-page.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ export class BrowserPage extends InstancePage {
108108
loadAllBtn = Selector('[data-testid=load-all-value-btn]');
109109
downloadAllValueBtn = Selector('[data-testid=download-all-value-btn]');
110110
openTutorialsBtn = Selector('[data-testid=explore-msg-btn]');
111-
exploreRedisBtn = Selector('[data-testid=explore-redis-btn]');
112111
//CONTAINERS
113112
streamGroupsContainer = Selector('[data-testid=stream-groups-container]');
114113
streamConsumersContainer = Selector('[data-testid=stream-consumers-container]');
@@ -266,7 +265,6 @@ export class BrowserPage extends InstancePage {
266265
keyListItem = Selector('[role=rowgroup] [role=row]');
267266
// Dialog
268267
noReadySearchDialogTitle = Selector('[data-testid=welcome-page-title]');
269-
closeDialogButton = Selector('[class*=euiModal__closeIcon]');
270268

271269
//Get Hash key field ttl value
272270
//for Redis databases 7.4 and higher
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { Selector } from 'testcafe';
2+
3+
export class Modal {
4+
closeModalButton = Selector('[class*=euiModal__closeIcon]');
5+
}

tests/e2e/pageObjects/components/insights-panel.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { ExploreTab } from './explore-tab';
66
export class InsightsPanel {
77
// CONTAINERS
88
sidePanel = Selector('[data-testid=side-panels-insights]');
9-
explorePanelButton = Selector('[data-testid=insights-trigger]');
109
closeButton = Selector('[data-testid=close-insights-btn]');
1110
activeTab = Selector('[class*=euiTab-isSelected]');
1211

@@ -18,24 +17,13 @@ export class InsightsPanel {
1817

1918
activeTabMask = '[class*=euiTab-isSelected]';
2019

21-
/**
22-
* Open/Close Panel
23-
* @param state State of panel
24-
*/
25-
async togglePanel(state: boolean): Promise<void> {
26-
const isPanelExists = await this.sidePanel.exists;
27-
28-
if (state !== isPanelExists) {
29-
await t.click(this.explorePanelButton);
30-
}
31-
}
32-
3320
/**
3421
* get active tab
3522
*/
3623
async getActiveTabName(): Promise<string> {
3724
return (this.sidePanel.find(this.activeTabMask)).textContent;
3825
}
26+
3927
/**
4028
* Click on Panel tab
4129
* @param type of the tab
@@ -64,5 +52,4 @@ export class InsightsPanel {
6452
getInsightsPanel(): Selector {
6553
return Selector('[class=euiButton__text]').withExactText(ExploreTabs.Tips);
6654
}
67-
6855
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { t, Selector } from 'testcafe';
2+
import { InsightsPanel } from '../insights-panel';
3+
4+
export class NavigationHeader {
5+
insightsTriggerButton = Selector('[data-testid=insights-trigger]');
6+
cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
7+
8+
/**
9+
* Open/Close Panel
10+
* @param state State of panel
11+
*/
12+
async togglePanel(state: boolean): Promise<void> {
13+
const isPanelExists = await (new InsightsPanel()).sidePanel.exists;
14+
15+
if (state !== isPanelExists) {
16+
await t.click(this.insightsTriggerButton);
17+
}
18+
}
19+
}

tests/e2e/pageObjects/components/rdi/rdi-header.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ export class RdiHeader {
1717
importInput = Selector('[data-testid=import-file-modal-filepicker]');
1818
confirmUploadingPipelineBatton = Selector('[data-testid=submit-btn]');
1919

20-
cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
21-
2220
/**
2321
* Import pipeline
2422
* @param filePath the name if the file
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Selector } from 'testcafe';
2+
3+
export class AuthorizationDialog {
4+
//COMPONENTS
5+
authDialog = Selector('[data-testid=social-oauth-dialog]');
6+
//BUTTONS
7+
googleAuth = Selector('[data-testid=google-oauth]');
8+
gitHubAuth = Selector('[data-testid=github-oauth]');
9+
ssoAuth = Selector('[data-testid=sso-oauth]');
10+
}

tests/e2e/pageObjects/dialogs/user-agreement-dialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class UserAgreementDialog {
3030
/**
3131
* Get state of Recommended switcher
3232
*/
33-
async getRecommendedSwitcherValue(): Promise<string> {
33+
async getRecommendedSwitcherValue(): Promise<string | null> {
3434
return await this.recommendedSwitcher.getAttribute('aria-checked');
3535
}
3636
}

tests/e2e/pageObjects/instance-page.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import { Profiler, Cli, CommandHelper } from './components/bottom-panel';
33
import { OverviewPanel } from './components/overview-panel';
44
import { InsightsPanel } from './components/insights-panel';
55
import { MonacoEditor } from './components/monaco-editor';
6+
import { NavigationHeader } from './components/navigation/navigation-header';
67
export class InstancePage extends BasePage {
78
Profiler = new Profiler();
89
Cli = new Cli();
910
CommandHelper = new CommandHelper();
1011
OverviewPanel = new OverviewPanel();
1112
InsightsPanel = new InsightsPanel();
1213
MonacoEditor = new MonacoEditor();
14+
NavigationHeader = new NavigationHeader();
1315
}

0 commit comments

Comments
 (0)