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

add circleci parallelism to e2e

Author: vlad-dargel

.circleci/config.yml

@@ -48,8 +48,6 @@ executors:
     machine:
       image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
-    environment:
-      DISPLAY: ":99"
   docker-node:
     docker:
       - image: cimg/node:20.15
@@ -91,7 +89,7 @@ jobs:
           paths:
             - ~/.cache/yarn
 
-  e2e-app-image:
+  e2e-linux:
     executor: linux-executor-dlc
     parameters:
       report:
@@ -116,10 +114,22 @@ jobs:
           command: |
             sudo apt-get install -y xvfb
             Xvfb :99 -screen 0 1920x1080x24 &
+      - run:
+          name: Install dependencies
+          command: cd tests/e2e && yarn install
+      - run:
+          name: Compile TypeScript
+          command: cd tests/e2e && yarn compile
+      - run:
+          name: Verify Compiled Files
+          command: ls -R tests/e2e/dist/tests/
       - run:
           name: Run e2e tests
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+            cd tests/e2e/dist
+            export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.js" | circleci tests split --split-by=timings)
+            echo "Running tests: $TEST_FILES"
+            cd ../../..
             .circleci/e2e/test.app.sh
       - when:
           condition:
@@ -402,7 +412,7 @@ workflows:
           requires:
             - Start E2E Tests
 
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (linux)
           parallelism: 2
           requires:
@@ -511,7 +521,7 @@ workflows:
           name: Build extension - Windows (stage)
           <<: *stageFilter
       # e2e tests on linux build
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (linux)
           parallelism: 2
           requires:
@@ -549,7 +559,7 @@ workflows:
           <<: *prodFilter
 
       # e2e tests on linux build
-      - e2e-app-image:
+      - e2e-linux:
           name: E2ETest (Linux)
           parallelism: 2
           requires:

.circleci/e2e/test.app.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
 set -e
 
-yarn --cwd tests/e2e install
-
-# create folder before tests run to prevent permissions issue
+# Create folder before tests run to prevent permissions issues
 mkdir -p tests/e2e/remote
 
-# run rte
+# Run RTE (Redis Test Environment)
 docker-compose -f tests/e2e/rte.docker-compose.yml build
 docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
-./tests/e2e/wait-for-redis.sh localhost 12000 && \
+./tests/e2e/wait-for-redis.sh localhost 12000
 
-# run tests
+# Run tests
 RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .ci.env yarn --cwd tests/e2e test:ci

tests/e2e/.ci.env

@@ -1,4 +1,3 @@
-COMMON_URL=http://localhost:5541
 API_URL=http://127.0.0.1:5541/api
 OSS_SENTINEL_PASSWORD=password
 RI_APP_FOLDER_NAME=.redis-for-vscode-stage

tests/e2e/.mocharc.js

@@ -4,7 +4,6 @@ module.exports = {
   color: true,
   delay: false,
   diff: true,
-  file: ['./tests/setup.js'],
   package: './package.json',
   parallel: false,
   recursive: false,
@@ -20,7 +19,7 @@ module.exports = {
       toConsole: false,
     },
   },
-  retries: 1,
+  retries: 3,
   timeout: 100_000,
   ui: 'bdd',
 }

tests/e2e/package.json

@@ -43,7 +43,7 @@
     "ts-node": "10.9.1",
     "tsc-alias": "^1.8.8",
     "typescript": "^5.1.3",
-    "vscode-extension-tester": "^8.5.0"
+    "vscode-extension-tester": "^8.6.0"
   },
   "dependencies": {
     "clone-deep": "^4.0.1",

tests/e2e/settings.json

@@ -3,4 +3,4 @@
     "workbench.editor.enablePreview": true,
     "git.autoRepositoryDetection": false,
     "terminal.integrated.sendKeybindingsToShell": true
-}
+}

tests/e2e/src/helpers/Conf.ts

@@ -5,7 +5,6 @@ import { Chance } from 'chance'
 const chance = new Chance()
 
 export class Config {
-  static commonUrl = process.env.COMMON_URL || 'http://localhost:8080'
   static apiUrl = process.env.API_URL || 'http://127.0.0.1:5541/api'
   static vscodeVersion = process.env.VSCODE_VERSION || '1.87.2'
   static extensionName =

tests/e2e/src/tests/browser/edit-key-name.ts renamed to tests/e2e/src/tests/browser/edit-key-name.e2e.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(2000)
+      CommonDriverExtension.driverSleep(3000)
       // Verify that all results have the same type as in filter
       expect(
         await treeView.getElementText(treeView.getTreeViewItemByIndex(i + 1)),