Merge pull request #187 from RedisInsight/e2e/bugfix/e2e-fix

vlad-dargel · web-flow · commit 16e9a56740a3 · 2024-08-26T09:26:24.000+02:00
E2e/bugfix/e2e fix
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -401,7 +401,7 @@ workflows:
 
       - e2e-app-image:
           name: E2ETest (linux)
-          parallelism: 1
+          parallelism: 2
           requires:
             - Build extension - Linux (stage)
 
@@ -510,7 +510,7 @@ workflows:
       # e2e tests on linux build
       - e2e-app-image:
           name: E2ETest (linux)
-          parallelism: 1
+          parallelism: 2
           requires:
             - Build extension - Linux (stage)
 
@@ -545,10 +545,10 @@ workflows:
           env: prod
           <<: *prodFilter
 
-      # e2e desktop tests on linux build
+      # e2e tests on linux build
       - e2e-app-image:
           name: E2ETest (Linux)
-          parallelism: 1
+          parallelism: 2
           requires:
             - Build extension - Linux (prod)
 
diff --git a/tests/e2e/.mocharc.js b/tests/e2e/.mocharc.js
@@ -20,7 +20,7 @@ module.exports = {
       toConsole: false,
     },
   },
-  retries: 0,
+  retries: 1,
   timeout: 100_000,
   ui: 'bdd',
 }
diff --git a/tests/e2e/src/helpers/api/Eula.ts b/tests/e2e/src/helpers/api/Eula.ts
@@ -6,7 +6,7 @@ export class Eula {
    * Accept eula
    */
   static async accept(): Promise<void> {
-    const spec = { agreements: { analytics: true, notifications: true, eula: true } }
+    const spec = { agreements: { analytics: true, notifications: true, eula: true, encryption: false } }
     const response = await CommonAPIRequests.sendPatchRequest(
       `/settings`,
       spec,
diff --git a/tests/e2e/src/helpers/common-actions/DatabasesActions.ts b/tests/e2e/src/helpers/common-actions/DatabasesActions.ts
@@ -11,7 +11,7 @@ import { TreeView } from '@e2eSrc/page-objects/components'
 import { InnerViews } from '@e2eSrc/page-objects/components/WebView'
 import { AddNewDatabaseParameters } from '../types/types'
 import { DatabaseAPIRequests } from '../api'
-import { NotificationActions } from './actions'
+import { InputActions, NotificationActions } from './actions'
 import { KeyDetailsActions } from './KeyDetailsActions'
 import { ServerActions } from './ServerActions'
 import { Eula } from '../api/Eula'
@@ -85,6 +85,7 @@ export class DatabasesActions extends CommonDriverExtension {
       await treeView.clickDatabaseByName(databaseParameters.databaseName!)
       await super.driverSleep(200)
     }
+    await InputActions.hoverElement(treeView.getCLIDatabaseBtnByName(databaseParameters.databaseName!),1000)
   }
 
   /**
diff --git a/tests/e2e/src/helpers/common-actions/TreeViewActions.ts b/tests/e2e/src/helpers/common-actions/TreeViewActions.ts
@@ -51,7 +51,7 @@ export class TreeViewActions extends CommonDriverExtension {
   ): Promise<void> {
     let treeView = new TreeView()
     // Wait for key refresh
-    await TreeViewActions.driverSleep(1000)
+    await TreeViewActions.driverSleep(2000)
     // Verify not patterned keys
     await this.verifyNotPatternedKeys(delimiter)
 
diff --git a/tests/e2e/src/page-objects/components/bottom-bar/CliViewPanel.ts b/tests/e2e/src/page-objects/components/bottom-bar/CliViewPanel.ts
@@ -77,6 +77,7 @@ export class CliViewPanel extends WebView {
       await input.sendKeys(command.charAt(i))
     }
     await input.sendKeys(Key.ENTER)
+    await InputActions.driver.sleep(300)
   }
 
   /**
diff --git a/tests/e2e/src/page-objects/components/editor-view/SettingsView.ts b/tests/e2e/src/page-objects/components/editor-view/SettingsView.ts
@@ -1,13 +1,22 @@
 import { By } from 'selenium-webdriver'
 import { WebView } from '@e2eSrc/page-objects/components/WebView'
-import { CheckboxActions } from '@e2eSrc/helpers/common-actions'
+import {
+  ButtonActions,
+  CheckboxActions,
+  InputActions,
+} from '@e2eSrc/helpers/common-actions'
+import { InputWithButtons } from '../common/InputWithButtons'
 
 /**
  * Settings view
  */
 export class SettingsView extends WebView {
-  switchAnalyticsOption = By.xpath(`//*[@data-testid='check-option-analytics']/..`)
-  switchAnalyticsCheckbox = By.xpath(`//input[@data-testid='check-option-analytics']/../../div[contains(@class, 'checkmarkContainer')]`)
+  switchAnalyticsOption = By.xpath(
+    `//*[@data-testid='check-option-analytics']/..`,
+  )
+  switchAnalyticsCheckbox = By.xpath(
+    `//input[@data-testid='check-option-analytics']/../../div[contains(@class, 'checkmarkContainer')]`,
+  )
   delimiterInput = By.xpath(`//input[@data-testid='input-delimiter']`)
 
   /**
@@ -17,4 +26,12 @@ export class SettingsView extends WebView {
     const switcherElement = await super.getElement(this.switchAnalyticsOption)
     return await CheckboxActions.getCheckboxState(switcherElement)
   }
+
+  /**
+   * Set delimiter default value
+   */
+  async setDelimiterDefaultValue(): Promise<void> {
+    await InputActions.slowType(this.delimiterInput, ':')
+    await ButtonActions.clickElement(InputWithButtons.applyInput)
+  }
 }
diff --git a/tests/e2e/src/tests/browser/edit-key-value.ts b/tests/e2e/src/tests/browser/edit-key-value.ts
@@ -78,6 +78,7 @@ describe('Edit Key values verification', () => {
       Config.ossStandaloneConfig.databaseName,
     )
     await new EditorView().closeAllEditors()
+    await NotificationActions.closeAllNotifications()
     await keyDetailsView.switchToInnerViewFrame(InnerViews.TreeInnerView)
     // Refresh database
     await treeView.refreshDatabaseByName(
diff --git a/tests/e2e/src/tests/browser/filtering.ts b/tests/e2e/src/tests/browser/filtering.ts
@@ -428,7 +428,7 @@ describe('Filtering per key name in DB with 10 millions of keys', () => {
     for (let i = 0; i < keyTypes.length - 1; i++) {
       await treeView.selectFilterGroupType(keyTypes[i].keyName)
       // Waiting for long db loading
-      CommonDriverExtension.driverSleep(1000)
+      CommonDriverExtension.driverSleep(2000)
       // Verify that all results have the same type as in filter
       expect(
         await treeView.getElementText(treeView.getTreeViewItemByIndex(i + 1)),
diff --git a/tests/e2e/src/tests/browser/verify-key-details.ts b/tests/e2e/src/tests/browser/verify-key-details.ts
@@ -22,6 +22,7 @@ import {
   DatabasesActions,
   InputActions,
   KeyDetailsActions,
+  NotificationActions,
 } from '@e2eSrc/helpers/common-actions'
 import { AddStringKeyView } from '@e2eSrc/page-objects/components/editor-view/AddStringKeyView'
 import { KeyTypesShort } from '@e2eSrc/helpers/constants'
@@ -97,6 +98,7 @@ describe('Key Details verifications', () => {
     )
 
     await InputActions.typeText(addStringKeyView.keyNameInput, keyName)
+    await NotificationActions.closeAllNotifications()
 
     await ButtonActions.clickElement(addStringKeyView.addButton)
     await addStringKeyView.switchBack()
diff --git a/tests/e2e/src/tests/cli/cli.ts b/tests/e2e/src/tests/cli/cli.ts
@@ -2,7 +2,6 @@ import { expect } from 'chai'
 import { describe, it } from 'mocha'
 import { before, beforeEach, after, afterEach } from 'vscode-extension-tester'
 import {
-  BottomBar,
   CliViewPanel,
   TreeView,
 } from '@e2eSrc/page-objects/components'
@@ -16,14 +15,12 @@ import { ButtonActions } from '@e2eSrc/helpers/common-actions'
 import { InnerViews } from '@e2eSrc/page-objects/components/WebView'
 
 describe('CLI critical', () => {
-  let bottomBar: BottomBar
   let cliViewPanel: CliViewPanel
   let treeView: TreeView
 
   let keyName = Common.generateWord(20)
 
   before(async () => {
-    bottomBar = new BottomBar()
     cliViewPanel = new CliViewPanel()
     treeView = new TreeView()
 
@@ -40,6 +37,7 @@ describe('CLI critical', () => {
     await treeView.switchBack()
     await CommonDriverExtension.driverSleep(1000)
     await cliViewPanel.switchToInnerViewFrame(InnerViews.CliInnerView)
+    await cliViewPanel.executeCommand('clear')
   })
   afterEach(async () => {
     await KeyAPIRequests.deleteKeyIfExistsApi(
diff --git a/tests/e2e/src/tests/settings/settings.ts b/tests/e2e/src/tests/settings/settings.ts
@@ -34,6 +34,7 @@ describe('Settings', () => {
     // Go to Settings page
     await ButtonActions.clickElement(treeView.settingsButton)
     await settingsView.switchToInnerViewFrame(InnerViews.SettingsInnerView)
+    await settingsView.setDelimiterDefaultValue()
   })
   beforeEach(async () => {
     await treeView.switchBack()
diff --git a/tests/e2e/src/tests/setup.ts b/tests/e2e/src/tests/setup.ts
@@ -134,7 +134,7 @@ describe('Agreements Verification', () => {
 
   it('Verify that user can accept User Agreements', async () => {
     const expectedWelcomeLinks = [
-      'https://redis.io/docs/latest/develop/connect/insight/?utm_source=redisinsight&utm_medium=vscode&utm_campaign=empty_database',
+      'https://redis.io/try-free/?utm_source=redisinsight&utm_medium=vscode&utm_campaign=empty_database',
       'https://hub.docker.com/r/redis/redis-stack-server',
     ]
     await CheckboxActions.toggleCheckbox(eulaView.useRecommendedCheckbox, true)
diff --git a/tests/e2e/src/tests/tree-view/empty-db-list.ts b/tests/e2e/src/tests/tree-view/empty-db-list.ts
@@ -31,7 +31,7 @@ describe('Empty database', () => {
   })
 
   it('Verify that form to add database can be opened from empty db page', async function () {
-    const expectedWelcomeLinks = ['https://redis.io/docs/latest/develop/connect/insight/?utm_source=redisinsight&utm_medium=vscode&utm_campaign=empty_database', 'https://hub.docker.com/r/redis/redis-stack-server']
+    const expectedWelcomeLinks = ['https://redis.io/try-free/?utm_source=redisinsight&utm_medium=vscode&utm_campaign=empty_database', 'https://hub.docker.com/r/redis/redis-stack-server']
 
     await ButtonActions.clickElement(emptyView.connectDatabaseButton)
 
diff --git a/tests/e2e/src/tests/tree-view/tree-view.ts b/tests/e2e/src/tests/tree-view/tree-view.ts
@@ -106,7 +106,7 @@ describe('Tree view verifications', () => {
 
     // Verify that user can change the sorting ASC-DESC
     await ButtonActions.clickElement(treeView.sortKeysBtn)
-    await CommonDriverExtension.driverSleep(500)
+    await CommonDriverExtension.driverSleep(1000)
     await treeView.openTreeFolders([`${keyNames[2]}`.split(':')[0]])
     await treeView.openTreeFolders([`${keyNames[0]}`.split(':')[0]])
     expect(

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ module.exports = {`
`20`	`20`	`toConsole: false,`
`21`	`21`	`},`
`22`	`22`	`},`
`23`		`- retries: 0,`
	`23`	`+ retries: 1,`
`24`	`24`	`timeout: 100_000,`
`25`	`25`	`ui: 'bdd',`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ export class CliViewPanel extends WebView {`
`77`	`77`	`await input.sendKeys(command.charAt(i))`
`78`	`78`	`}`
`79`	`79`	`await input.sendKeys(Key.ENTER)`
	`80`	`+ await InputActions.driver.sleep(300)`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ describe('Edit Key values verification', () => {`
`78`	`78`	`Config.ossStandaloneConfig.databaseName,`
`79`	`79`	`)`
`80`	`80`	`await new EditorView().closeAllEditors()`
	`81`	`+ await NotificationActions.closeAllNotifications()`
`81`	`82`	`await keyDetailsView.switchToInnerViewFrame(InnerViews.TreeInnerView)`
`82`	`83`	`// Refresh database`
`83`	`84`	`await treeView.refreshDatabaseByName(`