Merge pull request #175 from RedisInsight/e2e/bugfix/feature-bugfix

E2e/bugfix/feature bugfix

Author: vlad-dargel

.circleci/config.yml

@@ -345,14 +345,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)
@@ -362,6 +362,8 @@ workflows:
               only:
                 - /^e2e/feature.*/
                 - /^e2e/bugfix.*/
+          requires:
+            - Start E2E Tests
 
       - e2e-app-image:
           name: E2ETest (linux)
@@ -474,7 +476,7 @@ workflows:
       # e2e tests on linux build
       - e2e-app-image:
           name: E2ETest (linux)
-          parallelism: 2
+          parallelism: 1
           requires:
             - Build extension - Linux (stage)
 
@@ -512,7 +514,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/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
@@ -34,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)
   }
 
   /**
@@ -54,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/tests/browser/zset-key.ts

@@ -27,15 +27,11 @@ import { InnerViews } from '@e2eSrc/page-objects/components/WebView'
 let keyName: string
 
 describe('ZSet Key fields verification', () => {
-  let bottomBar: BottomBar
-  let bottomBarPanel: BottomBarPanel
   let keyDetailsView: SortedSetKeyDetailsView
   let treeView: TreeView
   let addSortedSetKeyView: AddSortedSetKeyView
 
   before(async () => {
-    bottomBar = new BottomBar()
-    bottomBarPanel = new BottomBarPanel()
     keyDetailsView = new SortedSetKeyDetailsView()
     treeView = new TreeView()
     addSortedSetKeyView = new AddSortedSetKeyView()

tests/e2e/src/vscode.runner.ts

@@ -31,7 +31,7 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
       __dirname,
       '..',
       'test-extensions',
-      'redis.redis-for-vscode-0.0.3',
+      'redis.redis-for-vscode-0.0.1',
       'dist',
       'redis-backend',
       'dist-minified',