add tests for cloud sso button

vlad-dargel · vlad-dargel · commit 8664b80a6d84 · 2024-08-26T18:10:20.000+02:00
diff --git a/tests/e2e/pageObjects/base-overview-page.ts b/tests/e2e/pageObjects/base-overview-page.ts
@@ -3,10 +3,15 @@ import { RedisOverviewPage } from '../helpers/constants';
 import { Toast } from './components/common/toast';
 import { ShortcutsPanel } from './components/shortcuts-panel';
 import { EditorButton } from './components/common/editorButton';
+import { NavigationHeader } from './components/navigation/navigation-header';
+import { Modal } from './components/common/modal';
+
 export class BaseOverviewPage {
     ShortcutsPanel = new ShortcutsPanel();
     Toast = new Toast();
     EditorButton = new EditorButton();
+    NavigationHeader = new NavigationHeader();
+    Modal = new Modal();
 
     notification = Selector('[data-testid^=-notification]');
     deleteRowButton = Selector('[data-testid^=delete-instance-]');
@@ -21,6 +26,7 @@ export class BaseOverviewPage {
 
     databasePageLink = Selector('[data-testid=home-tab-databases]');
     rdiPageLink = Selector('[data-testid=home-tab-rdi-instances]');
+    exploreRedisBtn = Selector('[data-testid=explore-redis-btn]');
 
     /**
      * Reload page
diff --git a/tests/e2e/pageObjects/base-page.ts b/tests/e2e/pageObjects/base-page.ts
@@ -3,6 +3,7 @@ import { NavigationPanel } from './components/navigation-panel';
 import { Toast } from './components/common/toast';
 import { ShortcutsPanel } from './components/shortcuts-panel';
 import { EditorButton } from './components/common/editorButton';
+import { Modal } from './components/common/modal';
 
 export class BasePage {
     notification = Selector('[data-testid^=-notification]');
@@ -11,6 +12,7 @@ export class BasePage {
     ShortcutsPanel = new ShortcutsPanel();
     Toast = new Toast();
     EditorButton = new EditorButton();
+    Modal = new Modal();
 
     /**
      * Reload page
diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts
@@ -108,7 +108,6 @@ export class BrowserPage extends InstancePage {
     loadAllBtn = Selector('[data-testid=load-all-value-btn]');
     downloadAllValueBtn = Selector('[data-testid=download-all-value-btn]');
     openTutorialsBtn = Selector('[data-testid=explore-msg-btn]');
-    exploreRedisBtn = Selector('[data-testid=explore-redis-btn]');
     //CONTAINERS
     streamGroupsContainer = Selector('[data-testid=stream-groups-container]');
     streamConsumersContainer = Selector('[data-testid=stream-consumers-container]');
@@ -266,7 +265,6 @@ export class BrowserPage extends InstancePage {
     keyListItem = Selector('[role=rowgroup] [role=row]');
     // Dialog
     noReadySearchDialogTitle = Selector('[data-testid=welcome-page-title]');
-    closeDialogButton = Selector('[class*=euiModal__closeIcon]');
 
     //Get Hash key field ttl value
     //for Redis databases 7.4 and higher
diff --git a/tests/e2e/pageObjects/components/common/modal.ts b/tests/e2e/pageObjects/components/common/modal.ts
@@ -0,0 +1,5 @@
+import { Selector } from 'testcafe';
+
+export class Modal {
+    closeModalButton = Selector('[class*=euiModal__closeIcon]');
+}
diff --git a/tests/e2e/pageObjects/components/insights-panel.ts b/tests/e2e/pageObjects/components/insights-panel.ts
@@ -2,11 +2,13 @@ import { Selector, t } from 'testcafe';
 import { ExploreTabs } from '../../helpers/constants';
 import { RecommendationsTab } from './recommendations-tab';
 import { ExploreTab } from './explore-tab';
+import { NavigationHeader } from './navigation/navigation-header';
 
 export class InsightsPanel {
+    NavigationHeader = new NavigationHeader();
+
     // CONTAINERS
     sidePanel = Selector('[data-testid=side-panels-insights]');
-    explorePanelButton = Selector('[data-testid=insights-trigger]');
     closeButton = Selector('[data-testid=close-insights-btn]');
     activeTab = Selector('[class*=euiTab-isSelected]');
 
@@ -26,7 +28,7 @@ export class InsightsPanel {
         const isPanelExists = await this.sidePanel.exists;
 
         if (state !== isPanelExists) {
-            await t.click(this.explorePanelButton);
+            await t.click(this.NavigationHeader.insightsTriggerButton);
         }
     }
 
diff --git a/tests/e2e/pageObjects/components/navigation/navigation-header.ts b/tests/e2e/pageObjects/components/navigation/navigation-header.ts
@@ -0,0 +1,6 @@
+import { Selector } from 'testcafe';
+
+export class NavigationHeader {
+    insightsTriggerButton = Selector('[data-testid=insights-trigger]');
+    cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
+}
diff --git a/tests/e2e/pageObjects/components/rdi/rdi-header.ts b/tests/e2e/pageObjects/components/rdi/rdi-header.ts
@@ -17,8 +17,6 @@ export class RdiHeader {
     importInput = Selector('[data-testid=import-file-modal-filepicker]');
     confirmUploadingPipelineBatton = Selector('[data-testid=submit-btn]');
 
-    cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
-
     /**
      * Import pipeline
      * @param filePath the name if the file
diff --git a/tests/e2e/pageObjects/dialogs/authorization-dialog.ts b/tests/e2e/pageObjects/dialogs/authorization-dialog.ts
@@ -0,0 +1,10 @@
+import { Selector } from 'testcafe';
+
+export class AuthorizationDialog {
+    //COMPONENTS
+    authDialog = Selector('[data-testid=social-oauth-dialog]');
+    //BUTTONS
+    googleAuth = Selector('[data-testid=google-oauth]');
+    gitHubAuth = Selector('[data-testid=github-oauth]');
+    ssoAuth = Selector('[data-testid=sso-oauth]');
+}
diff --git a/tests/e2e/pageObjects/dialogs/user-agreement-dialog.ts b/tests/e2e/pageObjects/dialogs/user-agreement-dialog.ts
@@ -30,7 +30,7 @@ export class UserAgreementDialog {
     /**
      * Get state of Recommended switcher
      */
-    async getRecommendedSwitcherValue(): Promise<string> {
+    async getRecommendedSwitcherValue(): Promise<string | null> {
         return await this.recommendedSwitcher.getAttribute('aria-checked');
     }
 }
diff --git a/tests/e2e/pageObjects/instance-page.ts b/tests/e2e/pageObjects/instance-page.ts
@@ -3,11 +3,13 @@ import { Profiler, Cli, CommandHelper } from './components/bottom-panel';
 import { OverviewPanel } from './components/overview-panel';
 import { InsightsPanel } from './components/insights-panel';
 import { MonacoEditor } from './components/monaco-editor';
+import { NavigationHeader } from './components/navigation/navigation-header';
 export class InstancePage extends BasePage {
     Profiler = new Profiler();
     Cli = new Cli();
     CommandHelper = new CommandHelper();
     OverviewPanel = new OverviewPanel();
     InsightsPanel = new InsightsPanel();
     MonacoEditor = new MonacoEditor();
+    NavigationHeader = new NavigationHeader();
 }
diff --git a/tests/e2e/pageObjects/my-redis-databases-page.ts b/tests/e2e/pageObjects/my-redis-databases-page.ts
@@ -5,6 +5,8 @@ import { InsightsPanel } from './components/insights-panel';
 import { CompatibilityPromotion } from './components/compatibility-promotion';
 import { BaseOverviewPage } from './base-overview-page';
 import { NavigationPanel } from './components/navigation-panel';
+import { NavigationHeader } from './components/navigation/navigation-header';
+import { AuthorizationDialog } from './dialogs/authorization-dialog';
 
 const databaseAPIRequests = new DatabaseAPIRequests();
 
@@ -14,6 +16,8 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
     AddRedisDatabase = new AddRedisDatabase();
     InsightsPanel = new InsightsPanel();
     CompatibilityPromotion = new CompatibilityPromotion();
+    NavigationHeader = new NavigationHeader();
+    AuthorizationDialog = new AuthorizationDialog();
 
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
@@ -39,12 +43,10 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
     sortByLastConnection = Selector('span').withAttribute('title', 'Last connection');
     importDatabasesBtn = Selector('[data-testid=import-from-file-btn]');
     submitImportBtn = Selector('[data-testid=submit-btn]');
-    closeDialogBtn = Selector('[aria-label="Closes this modal window"]');
     okDialogBtn = Selector('[data-testid=ok-btn]');
     removeImportedFileBtn = Selector('[aria-label="Clear selected files"]');
     exportBtn = Selector('[data-testid=export-btn]');
     exportSelectedDbsBtn = Selector('[data-testid=export-selected-dbs]');
-    exploreRedisBtn = Selector('[data-testid=explore-redis-btn]');
     userProfileBtn = Selector('[data-testid=user-profile-btn]');
     addDbFromEmptyListBtn = Selector('[data-testid=empty-rdi-instance-button]');
     emptyDbCloudBtn = Selector('[data-testid=empty-database-cloud-button]');
@@ -90,7 +92,8 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
     connectionTypeTitle  = Selector('[data-test-subj=tableHeaderCell_connectionType_2]');
     signInAgreement = Selector('[class="euiCheckbox__square"]');
     googleAuth = Selector('[data-testid=google-oauth]');
-    authDialog = Selector('[data-testid=social-oauth-dialog]');
+    gitHubAuth = Selector('[data-testid=github-oauth]');
+    ssoAuth = Selector('[data-testid=sso-oauth]');
 
     /**
      * Click on the database by name
diff --git a/tests/e2e/pageObjects/workbench-page.ts b/tests/e2e/pageObjects/workbench-page.ts
@@ -46,7 +46,6 @@ export class WorkbenchPage extends InstancePage {
     groupMode = Selector('[data-testid=btn-change-group-mode]');
     copyCommand = Selector('[data-testid=copy-command]');
     clearResultsBtn = Selector('[data-testid=clear-history-btn]');
-    exploreRedisBtn = Selector('[data-testid=no-results-explore-btn]');
     //ICONS
     noCommandHistoryIcon = Selector('[data-testid=wb_no-results__icon]');
     parametersAnchor = Selector('[data-testid=parameters-anchor]');
diff --git a/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts b/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts
@@ -8,17 +8,14 @@ import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { modifyFeaturesConfigJson, updateControlNumber } from '../../../../helpers/insights';
 import { processGoogleSSO } from '../../../../helpers/google-authorization';
 import { openChromeWithUrl, saveOpenedChromeTabUrl } from '../../../../helpers/scripts/browser-scripts';
-import { RdiInstancePage } from '../../../../pageObjects/rdi-instance-page';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const databaseHelper = new DatabaseHelper();
 const databaseAPIRequests = new DatabaseAPIRequests();
-const rdiInstancePage = new RdiInstancePage();
 
 let urlToUse = '';
 const pathes = {
     defaultRemote: path.join('.', 'test-data', 'features-configs', 'insights-default-remote.json'),
-    dockerConfig: path.join('.', 'test-data', 'features-configs', 'sso-docker-build.json'),
     electronConfig: path.join('.', 'test-data', 'features-configs', 'sso-electron-build.json')
 };
 
@@ -28,44 +25,43 @@ fixture `Cloud SSO`
     .beforeEach(async() => {
         await databaseAPIRequests.deleteAllDatabasesApi();
         await databaseHelper.acceptLicenseTerms();
+        // Update remote config .json to config with buildType filter including current app build
+        await modifyFeaturesConfigJson(pathes.electronConfig);
+        await updateControlNumber(48.2);
     })
     .afterEach(async() => {
-        // await databaseAPIRequests.deleteAllDatabasesApi();
-        // await myRedisDatabasePage.reloadPage();
-        // // Update remote config .json to default
-        // await modifyFeaturesConfigJson(pathes.defaultRemote);
-        // // Clear features config table
-        // await DatabaseScripts.deleteRowsFromTableInDB({ tableName: 'features_config' });
+        await databaseAPIRequests.deleteAllDatabasesApi();
     });
 test('Verify that user can see SSO feature if it is enabled in feature config', async t => {
-    //TODO should be updated when AI or sth other will be added
-
-    // Update remote config .json to config with buildType filter excluding current app build
-    // await modifyFeaturesConfigJson(pathes.dockerConfig);
-    // await updateControlNumber(48.2);
-    // // Verify that user can't see SSO feature if it is disabled in feature config
-    // await t.expect(myRedisDatabasePage.promoButton.exists).notOk('promo Cloud database button displayed when SSO feature disabled');
+    await t.expect(myRedisDatabasePage.NavigationHeader.cloudSignInButton.exists).ok('Cloud Sign in button not displayed when SSO feature enabled');
 
-    // Update remote config .json to config with buildType filter including current app build
-    await modifyFeaturesConfigJson(pathes.electronConfig);
-    await updateControlNumber(48.2);
-    await t.expect(myRedisDatabasePage.promoButton.exists).ok('Import Cloud database button not displayed when SSO feature enabled');
+    // Open Cloud Sign in dialog
+    await t.click(myRedisDatabasePage.promoButton);
+    // Verify that Cloud Sign in dialog has authorization buttons for Electron app
+    await t.expect(myRedisDatabasePage.AuthorizationDialog.authDialog.exists).ok('Cloud Sigh in modal not opened');
+    await t.expect(myRedisDatabasePage.AuthorizationDialog.googleAuth.exists).ok('Google auth button not displayed in Sigh in modal');
+    await t.expect(myRedisDatabasePage.AuthorizationDialog.gitHubAuth.exists).ok('Github auth button not displayed in Sigh in modal');
+    await t.expect(myRedisDatabasePage.AuthorizationDialog.ssoAuth.exists).ok('SSO auth button not displayed in Sigh in modal');
+    await t.click(myRedisDatabasePage.Modal.closeModalButton);
 
-    await t.click(
-        myRedisDatabasePage.AddRedisDatabase.addDatabaseButton);
-    await t.click(
-        myRedisDatabasePage.AddRedisDatabase.addAutoDiscoverDatabase);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.addDatabaseButton);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.addAutoDiscoverDatabase);
     // Verify that RE Cloud auto-discovery options Use Cloud Account and Use Cloud API Keys are displayed on Welcome screen
     await t.expect(myRedisDatabasePage.AddRedisDatabase.useCloudAccount.exists).ok('Use Cloud Account accordion not displayed when SSO feature enabled');
     await t.expect(myRedisDatabasePage.AddRedisDatabase.useCloudKeys.exists).ok('Use Cloud Keys accordion not displayed when SSO feature enabled');
+    await t.click(myRedisDatabasePage.AddRedisDatabase.useCloudAccount);
+    // Verify that Auth buttons are displayed for auto-discovery panel on Electron app
+    await t.expect(myRedisDatabasePage.googleAuth.exists).ok('Google auth button not displayed when SSO feature enabled');
+    await t.expect(myRedisDatabasePage.gitHubAuth.exists).ok('Github auth button not displayed when SSO feature enabled');
+    await t.expect(myRedisDatabasePage.ssoAuth.exists).ok('SSO auth button not displayed when SSO feature enabled');
 });
 // skip until adding linux support
 test.skip('Verify that user can sign in using SSO via Google authorization', async t => {
     const logsFilename = 'chrome_logs.txt';
     const logsFilePath = path.join('test-data', logsFilename);
 
     await t.expect(myRedisDatabasePage.promoButton.exists).ok('Import Cloud database button not displayed when SSO feature enabled');
-    await t.click(rdiInstancePage.RdiHeader.cloudSignInButton);
+    await t.click(myRedisDatabasePage.NavigationHeader.cloudSignInButton);
     // Navigate to Google Auth button
     await t.pressKey('tab');
     await t.pressKey('tab');
@@ -82,7 +78,7 @@ test.skip('Verify that user can sign in using SSO via Google authorization', asy
 
     urlToUse = fs.readFileSync(logsFilePath, 'utf8');
     await processGoogleSSO(urlToUse);
-    await t.expect(rdiInstancePage.RdiHeader.cloudSignInButton.exists).notOk('Sign in button still displayed', { timeout: 10000 });
+    await t.expect(myRedisDatabasePage.NavigationHeader.cloudSignInButton.exists).notOk('Sign in button still displayed', { timeout: 10000 });
     await myRedisDatabasePage.reloadPage();
     await t.expect(myRedisDatabasePage.userProfileBtn.exists).ok('User profile button not displayed');
     await t.click(myRedisDatabasePage.userProfileBtn);
diff --git a/tests/e2e/tests/electron/regression/insights/feature-flag.e2e.ts b/tests/e2e/tests/electron/regression/insights/feature-flag.e2e.ts
@@ -35,10 +35,10 @@ test.skip('Verify that Insights panel can be displayed for Electron app accordin
     // Update remote config .json to config with buildType filter excluding current app build
     await modifyFeaturesConfigJson(pathes.dockerConfig);
     await updateControlNumber(48.2);
-    await t.expect(browserPage.InsightsPanel.explorePanelButton.exists).notOk('Insights panel displayed when filter excludes this buildType');
+    await t.expect(browserPage.NavigationHeader.insightsTriggerButton.exists).notOk('Insights panel displayed when filter excludes this buildType');
 
     // Update remote config .json to config with buildType filter including current app build
     await modifyFeaturesConfigJson(pathes.electronConfig);
     await updateControlNumber(48.2);
-    await t.expect(browserPage.InsightsPanel.explorePanelButton.exists).ok('Insights panel not displayed when filter includes this buildType');
+    await t.expect(browserPage.NavigationHeader.insightsTriggerButton.exists).ok('Insights panel not displayed when filter includes this buildType');
 });
diff --git a/tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts b/tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts
@@ -122,7 +122,7 @@ test.before(async() => {
         .expect(myRedisDatabasePage.failedImportMessage.textContent).contains(parseFailedMsg2);
 
     // Verify that user can remove file from import input
-    await t.click(myRedisDatabasePage.closeDialogBtn);
+    await t.click(myRedisDatabasePage.Modal.closeModalButton);
     await t.click(myRedisDatabasePage.importDatabasesBtn);
     await t.setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [rdmData.path]);
     // Unskip after updating testcafe with opening links support https://redislabs.atlassian.net/browse/RI-5565
diff --git a/tests/e2e/tests/web/critical-path/rdi/navigation.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/navigation.e2e.ts
@@ -79,11 +79,11 @@ test('Verify that context is saved after navigation panel', async() => {
 });
 
 test('Verify that Insight and Sign in buttons are displayed ', async() => {
-    await t.expect(rdiInstancePage.RdiHeader.InsightsPanel.explorePanelButton.exists).ok('Insight panel is not exist');
+    await t.expect(rdiInstancePage.NavigationHeader.insightsTriggerButton.exists).ok('Insight panel is not exist');
     await rdiInstancePage.RdiHeader.InsightsPanel.togglePanel(true);
     const tab = await rdiInstancePage.RdiHeader.InsightsPanel.getActiveTabName();
     await t.expect(tab).eql('Tutorials');
-    await t.expect(rdiInstancePage.RdiHeader.cloudSignInButton.exists).ok('sight in button is not exist');
+    await t.expect(rdiInstancePage.NavigationHeader.cloudSignInButton.exists).ok('sight in button is not exist');
 });
 
 test('Verify that confirmation message is displayed, if there are unsaved changes ', async() => {
diff --git a/tests/e2e/tests/web/regression/insights/open-insights-panel.e2e.ts b/tests/e2e/tests/web/regression/insights/open-insights-panel.e2e.ts
@@ -37,7 +37,7 @@ test
         await databaseAPIRequests.deleteAllDatabasesApi();
     })('Verify that insights panel is opened in cloud db if users db does not have some module', async t => {
         await t.click(browserPage.redisearchModeBtn);
-        await t.click(browserPage.closeDialogButton);
+        await t.click(browserPage.Modal.closeModalButton);
         await t.click(browserPage.NavigationPanel.myRedisDBButton);
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
         await t.expect(browserPage.InsightsPanel.sidePanel.exists).ok('Insights panel is not opened');

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export class UserAgreementDialog {`
`30`	`30`	`/**`
`31`	`31`	`* Get state of Recommended switcher`
`32`	`32`	`*/`
`33`		`- async getRecommendedSwitcherValue(): Promise<string> {`
	`33`	`+ async getRecommendedSwitcherValue(): Promise<string \| null> {`
`34`	`34`	`return await this.recommendedSwitcher.getAttribute('aria-checked');`
`35`	`35`	`}`
`36`	`36`	`}`