Merge remote-tracking branch 'origin/release/0.0.1' into feature/bugfix

Author: egor-zalenski

.circleci/config.yml

@@ -349,14 +349,14 @@ workflows:
 
   e2e-tests:
     jobs:
-      # - approve:
-      #     name: Start E2E Tests
-      #     type: approval
-      #     filters:
-      #       branches:
-      #         only:
-      #           - /^e2e/feature.*/
-      #           - /^e2e/bugfix.*/
+      - approve:
+          name: Start E2E Tests
+          type: approval
+          filters:
+            branches:
+              only:
+                - /^e2e/feature.*/
+                - /^e2e/bugfix.*/
 
       - linux:
           name: Build extension - Linux (stage)
@@ -366,6 +366,8 @@ workflows:
               only:
                 - /^e2e/feature.*/
                 - /^e2e/bugfix.*/
+          requires:
+            - Start E2E Tests
 
       - e2e-app-image:
           name: E2ETest (linux)
@@ -478,7 +480,7 @@ workflows:
       # e2e tests on linux build
       - e2e-app-image:
           name: E2ETest (linux)
-          parallelism: 2
+          parallelism: 1
           requires:
             - Build extension - Linux (stage)
 
@@ -516,7 +518,7 @@ workflows:
       # e2e desktop tests on linux build
       - e2e-app-image:
           name: E2ETest (Linux)
-          parallelism: 2
+          parallelism: 1
           requires:
             - Build extension - Linux (prod)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-for-vscode",
-  "version": "0.0.3",
+  "version": "0.0.1",
   "displayName": "Redis for VS Code",
   "description": "Visually interact with data and build queries in Redis",
   "license": "SEE LICENSE IN LICENSE",

tests/e2e/src/helpers/common-actions/actions/ButtonActions.ts

@@ -55,7 +55,7 @@ export class ButtonActions extends BaseActions{
    */
   static async clickElement(
     locatorToClick: Locator,
-    timeout: number = 3000,
+    timeout: number = 5000,
   ): Promise<void> {
     ButtonActions.initializeDriver()
     const elementToClick = await ButtonActions.driver.wait(

tests/e2e/src/page-objects/components/editor-view/DoubleColumnKeyDetailsView.ts

@@ -1,6 +1,7 @@
 import { By } from 'selenium-webdriver'
 import { ButtonActions, InputActions } from '@e2eSrc/helpers/common-actions'
 import { KeyDetailsView } from './KeyDetailsView'
+import { CommonDriverExtension } from '@e2eSrc/helpers'
 
 /**
  * Base view for all keyTypes that have 2 columns value
@@ -13,8 +14,6 @@ export class DoubleColumnKeyDetailsView extends KeyDetailsView {
     By.xpath(
       `//*[contains(@data-testid, "edit-${keyType}-button-${name}")] | //*[contains(@data-testid, "${keyType}_edit-btn-${name}")]`,
     )
-  getValueInput = (keyType: string, name: string): By =>
-    By.xpath(`//*[contains(@data-testid, "${keyType}_content-value-${name}")]`)
   getWrapperOfValueInput  = (keyType: string, name: string): By =>
     By.xpath(`//*[contains(@data-testid, "${keyType}_content-value-${name}")]/parent::*`)
 
@@ -36,6 +35,7 @@ export class DoubleColumnKeyDetailsView extends KeyDetailsView {
     await ButtonActions.clickElement(editLocator)
     await InputActions.typeText(editorLocator, value)
     await ButtonActions.clickElement(this.applyButton)
+    await CommonDriverExtension.driverSleep(300)
   }
 
   /**
@@ -56,5 +56,6 @@ export class DoubleColumnKeyDetailsView extends KeyDetailsView {
     await ButtonActions.clickElement(editLocator)
     await InputActions.slowType(editorLocator, value)
     await ButtonActions.clickElement(this.applyButton)
+    await CommonDriverExtension.driverSleep(300)
   }
 }

tests/e2e/src/page-objects/components/editor-view/HashKeyDetailsView.ts

@@ -9,12 +9,16 @@ import { Key } from 'vscode-extension-tester'
  * Hash Key details view
  */
 export class HashKeyDetailsView extends DoubleColumnKeyDetailsView {
-  hashFieldValueEditor = By.xpath(`//*[contains(@data-testid, 'hash_value-editor')]`)
+  hashFieldValueEditor = By.xpath(
+    `//*[contains(@data-testid, 'hash_value-editor')]`,
+  )
   hashFieldTtlEditor = By.xpath(`//*[@data-testid = 'inline-item-editor']`)
   hashFieldsList = By.xpath(
     `//*[contains(@data-testid, 'hash-field-') and not(contains(@data-testid,'value'))]/div`,
   )
-  hashValuesList = By.xpath(`//*[contains(@data-testid, 'hash_content-value-')]`)
+  hashValuesList = By.xpath(
+    `//*[contains(@data-testid, 'hash_content-value-')]`,
+  )
   truncatedValue = By.xpath(
     `//*[contains(@data-testid, 'hash_content-value-')]//*[@class = 'truncate']`,
   )
@@ -26,7 +30,9 @@ export class HashKeyDetailsView extends DoubleColumnKeyDetailsView {
     `//*[@data-testid = 'add-hash-field-panel']//*[contains(@data-testid, 'hash-value-')]`,
   )
   saveHashFieldButton = By.xpath(`//*[@data-testid = 'save-fields-btn']`)
-  showTtlCheckbox = By.xpath(`//*[@data-testid = 'show-ttl-column-checkbox']/parent::*/parent::*`)
+  showTtlCheckbox = By.xpath(
+    `//*[@data-testid = 'show-ttl-column-checkbox']/parent::*/parent::*`,
+  )
 
   getFieldTtlInputByField = (field: string): By =>
     By.xpath(`//div[@data-testid="hash-ttl_content-value-${field}"]`)
@@ -46,6 +52,8 @@ export class HashKeyDetailsView extends DoubleColumnKeyDetailsView {
       this.hashFieldValueEditor,
       KeyTypesShort.Hash,
     )
+    // Wait until value changes
+    await CommonDriverExtension.driverSleep(300)
   }
 
   /**
@@ -65,16 +73,23 @@ export class HashKeyDetailsView extends DoubleColumnKeyDetailsView {
    * @param fieldName The field name
    * @param fieldTtl The hash field ttl value for Redis databases 7.3.4 and higher
    */
-  async editHashKeyTtl(fieldName: string, fieldTtl: string = ''): Promise<void> {
+  async editHashKeyTtl(
+    fieldName: string,
+    fieldTtl: string = '',
+  ): Promise<void> {
     const enteredText = await this.getElementText(
-      this.getFieldTtlInputByField(fieldName))
+      this.getFieldTtlInputByField(fieldName),
+    )
     const count = enteredText.length
 
-    await InputActions.hoverElement(this.getFieldTtlInputByField(fieldName),1000)
+    await InputActions.hoverElement(
+      this.getFieldTtlInputByField(fieldName),
+      1000,
+    )
     await ButtonActions.clickElement(this.getEditFieldByField(fieldName))
 
     // clear the input
-    for(let i = 0; i < count; i++){
+    for (let i = 0; i < count; i++) {
       await InputActions.pressKey(this.hashFieldTtlEditor, Key.BACK_SPACE)
     }
     await InputActions.typeText(this.hashFieldTtlEditor, fieldTtl)

tests/e2e/src/page-objects/components/editor-view/KeyDetailsView.ts

@@ -78,7 +78,7 @@ export class KeyDetailsView extends WebView {
     By.xpath(`//*[@data-testid[starts-with(., '${keyName.split('-')[0]}') and contains(., '${columnName}')]]//*[@data-testid='value-as-json']
     | //*[@data-testid[starts-with(., '${keyName.split('-')[0]}-field-') and contains(., '${columnName}')]]//*[@data-testid='value-as-json']`)
   getEditBtnByKeyName = (keyName: string): By =>
-    By.xpath(`//vscode-button[contains(@data-testid, 'edit_') and contains(@data-testid, '${keyName}')]`)
+    By.xpath(`//vscode-button[contains(@data-testid, 'edit') and contains(@data-testid, '${keyName}')]`)
   /**
    * get key size
    */

tests/e2e/src/page-objects/components/editor-view/SortedSetKeyDetailsView.ts

@@ -12,7 +12,7 @@ export class SortedSetKeyDetailsView extends DoubleColumnKeyDetailsView {
     `//*[contains(@data-testid, 'zset-member-value-')]`,
   )
   truncatedValue = By.xpath(
-    `//*[contains(@data-testid, 'zset-member-value-')]//*[contains(@aria-describedby, 'popup')]`,
+    `//*[contains(@data-testid, 'zset-score-value-')]//*[@class = 'truncate']`,
   )
   scoreSortedSetFieldsList = By.xpath(
     `//*[contains(@data-testid, 'zset_content-value-')]`,

tests/e2e/src/page-objects/components/tree-view/TreeView.ts

@@ -260,7 +260,8 @@ export class TreeView extends WebView {
       value,
     )
     await ButtonActions.clickElement(this.keyTreeFilterApplyBtn)
-    await this.waitForElementVisibility(this.loadingIndicator, 1000, false)
+    await this.waitForElementVisibility(this.loadingIndicator, 2000, true)
+    await this.waitForElementVisibility(this.loadingIndicator, 5000, false)
   }
 
   /**

tests/e2e/src/tests/browser/filtering.ts

@@ -23,6 +23,7 @@ import {
   KeyTypesShort,
 } from '@e2eSrc/helpers/constants'
 import { InnerViews } from '@e2eSrc/page-objects/components/WebView'
+import { CommonDriverExtension } from '@e2eSrc/helpers'
 
 let keyName = `KeyForSearch*?[]789${Common.generateWord(10)}`
 let keyName2 = Common.generateWord(10)
@@ -426,10 +427,12 @@ describe('Filtering per key name in DB with 10 millions of keys', () => {
     await treeView.clearFilter()
     for (let i = 0; i < keyTypes.length - 1; i++) {
       await treeView.selectFilterGroupType(keyTypes[i].keyName)
+      // Waiting for long db loading
+      CommonDriverExtension.driverSleep(1000)
       // Verify that all results have the same type as in filter
       expect(
         await treeView.getElementText(treeView.getTreeViewItemByIndex(i + 1)),
-      ).contains(keyTypes[i].keyName, 'Keys filtered incorrectly by key type')
+      ).contains(keyTypes[i].keyName, 'Keys filtered incorrectly by key type after scanning more')
     }
   })
 })

tests/e2e/src/tests/browser/formatters.ts

@@ -1,6 +1,12 @@
 import { expect } from 'chai'
 import { describe, it } from 'mocha'
-import { before, beforeEach, after, afterEach, Locator } from 'vscode-extension-tester'
+import {
+  before,
+  beforeEach,
+  after,
+  afterEach,
+  Locator,
+} from 'vscode-extension-tester'
 import {
   CliAPIRequests,
   DatabaseAPIRequests,
@@ -16,7 +22,8 @@ import {
 } from '@e2eSrc/page-objects/components'
 import {
   ButtonActions,
-  DatabasesActions, InputActions,
+  DatabasesActions,
+  InputActions,
   KeyDetailsActions,
 } from '@e2eSrc/helpers/common-actions'
 import { formatters, phpData } from '../../test-data/formatters-data'
@@ -224,6 +231,7 @@ describe('Formatters', () => {
       await keyDetailsView.selectFormatter(formatter.format)
       await hashKeyDetailsView.editHashKeyValue(invalidText)
       await ButtonActions.clickElement(keyDetailsView.saveButton)
+      await CommonDriverExtension.driverSleep(500)
       // Verify that invalid value can be saved
       expect(
         await hashKeyDetailsView.getElementText(
@@ -487,7 +495,7 @@ describe('Formatters', () => {
         keysData,
         Config.ossStandaloneConfig.databaseName,
         value,
-        value
+        value,
       )
       // Refresh database
       await treeView.refreshDatabaseByName(
@@ -512,8 +520,26 @@ describe('Formatters', () => {
           await KeyDetailsActions.openKeyDetailsByKeyNameInIframe(key.keyName)
           await keyDetailsView.selectFormatter(formatter.format)
           await CommonDriverExtension.driverSleep(300)
+          // Hover over value to see edit button for hash and list
+          if (key.keyType === KeyTypesShort.Hash) {
+            await InputActions.hoverElement(
+              doubleColumnKeyDetailsView.getWrapperOfValueInput(
+                key.keyType,
+                value,
+              ),
+              1000,
+            )
+          }
+          if (key.keyType === KeyTypesShort.List) {
+            await InputActions.hoverElement(
+              doubleColumnKeyDetailsView.getWrapperOfValueInput(
+                key.keyType,
+                '0',
+              ),
+              1000,
+            )
+          }
           // Verify that edit button disabled for Hash, List, String keys
-          await InputActions.hoverElement(doubleColumnKeyDetailsView.getWrapperOfValueInput(key.keyName, value),1000)
           expect(await keyDetailsView.isElementDisabled(editBtn, 'class')).eql(
             true,
             `Key ${key.keyType} is enabled for ${formatter.format} formatter`,
@@ -530,6 +556,13 @@ describe('Formatters', () => {
           await KeyDetailsActions.openKeyDetailsByKeyNameInIframe(key.keyName)
           await keyDetailsView.selectFormatter(formatter.format)
           // Verify that edit button enabled for ZSet
+          await InputActions.hoverElement(
+            doubleColumnKeyDetailsView.getWrapperOfValueInput(
+              key.keyType,
+              '0',
+            ),
+            1000,
+          )
           expect(
             await keyDetailsView.isElementDisabled(editBtnLocator, 'class'),
           ).eql(