Merge branch 'main' into feature/remove_packages

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

README.md

@@ -15,7 +15,7 @@ For more details, check out the [release notes](https://github.com/RedisInsight/
 
 ## Get started with Redis for VS Code
 
-This repository contains the source code for the Redis for VS Code extension. To start using the extension, install it from the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/vscode).
+This repository contains the source code for the Redis for VS Code extension. Install the extension from the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=redis.redis-for-vscode).
 
 ## Feedback
 

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)),

tests/e2e/src/tests/browser/edit-key-value.ts renamed to tests/e2e/src/tests/browser/edit-key-value.e2e.ts

@@ -43,9 +43,6 @@ describe('Agreements Verification', () => {
     await eulaView.switchToInnerViewFrame(InnerViews.EulaInnerView)
     await eulaView.waitForElementVisibility(eulaView.submitButton)
   })
-  after(async () => {
-    await treeView.switchBack()
-  })
   afterEach(async () => {
     await treeView.switchBack()
   })

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

@@ -56,12 +56,31 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
       })
     }
 
+    let testFilesEnv: string | string[] = process.env.TEST_FILES!
+    if (process.env.TEST_FILES) {
+      testFilesEnv = process.env.TEST_FILES.split('\n').map(file => file.trim()).map((file) => {
+        return path.join(__dirname, '..', 'dist', file)
+      })
+
+      // Always prepend setup.js
+      const setupTestPath = path.join(
+        __dirname,
+        '..',
+        'dist',
+        'tests',
+        'setup.js',
+      )
+      testFilesEnv.unshift(setupTestPath)
+
+      console.log('Full Paths:', testFilesEnv)
+    } else {
+      console.error('TEST_FILES environment variable is not defined.')
+    }
+
     // Run tests
     await exTester.runTests(
-      [
-        path.join(__dirname, '..', 'dist', 'tests', 'setup.js'),
-        path.join(__dirname, '..', 'dist', 'tests', '**', '*.js'),
-      ],
+      testFilesEnv ||
+        path.join(__dirname, '..', 'dist', 'tests', '**', '*.e2e.js'),
       {
         settings: 'settings.json',
         logLevel: logging.Level.INFO,

tests/e2e/src/tests/browser/format-switcher.ts renamed to tests/e2e/src/tests/browser/format-switcher.e2e.ts

@@ -268,15 +268,15 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@redhat-developer/locators@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@redhat-developer/locators/-/locators-1.3.0.tgz#d15c0da18489cea44cc802f00013518e40da3941"
-  integrity sha512-dY8vNdAxFCX0Bl1/9rcSgQKeglI2H5XyCXPMPjyo517Fi2+lPLibonRdZS7imrwVCRkkXShf0A4qK1sGi7PI6g==
+"@redhat-developer/locators@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@redhat-developer/locators/-/locators-1.4.0.tgz#dfce161a95eb37e9092f30ac6ef5fe148472ccf7"
+  integrity sha512-RCWkhduNC88vem9jxkoZRFi/tCNl5pTB3tyWTXQ5wA3y3+jSHdxXveN7xMBr3kFlmNUiFiU9AuW3VuwDNj2fpw==
 
-"@redhat-developer/page-objects@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@redhat-developer/page-objects/-/page-objects-1.3.0.tgz#0bd24b273671f16509f532dac1f334b5f180313b"
-  integrity sha512-sTpiGyEnNRvJtZpJWgbz/K3qVWdqv67/KJhIQdRCOUbPuqYfk3ouF/Lxu+qVvHLhlPbgUPd6hz2Jtw1XyqSSZA==
+"@redhat-developer/page-objects@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@redhat-developer/page-objects/-/page-objects-1.4.0.tgz#60bc31413fa774b06172a243fde7fceb2f9885ee"
+  integrity sha512-/JDSnxIsxde275pBIlsZdPKh5u9XR/oKrG2ArV4IGFfyC1IfcLjCwcFpj708lcahXF8OTHlmh+1jTcsenpb+sg==
   dependencies:
     clipboardy "^4.0.0"
     clone-deep "^4.0.1"
@@ -442,10 +442,10 @@
   dependencies:
     redis "*"
 
-"@types/selenium-webdriver@^4.1.24":
-  version "4.1.25"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.25.tgz#9f04cbe716529f74b3d86a445c000aedec7813a6"
-  integrity sha512-Jnlg7h7WDq4k8N2p/zp1ax6qizvU9Pn37I/HR/KX8k5TIU1wfUAuBy8CA6x8drAqa9PY3kYykmmyNHU4tX91LQ==
+"@types/selenium-webdriver@^4.1.25":
+  version "4.1.26"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.26.tgz#09c696a341cf8cfc1641cded11d14813350b6ca9"
+  integrity sha512-PUgqsyNffal0eAU0bzGlh37MJo558aporAPZoKqBeB/pF7zhKl1S3zqza0GpwFqgoigNxWhEIJzru75eeYco/w==
   dependencies:
     "@types/node" "*"
     "@types/ws" "*"
@@ -627,10 +627,10 @@
     "@vscode/vsce-sign-win32-arm64" "2.0.2"
     "@vscode/vsce-sign-win32-x64" "2.0.2"
 
-"@vscode/vsce@^2.31.1":
-  version "2.31.1"
-  resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-2.31.1.tgz#2420167e5b5ac49ff8fd1aeebfadde43711fbe55"
-  integrity sha512-LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg==
+"@vscode/vsce@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-3.0.0.tgz#79fa4a263eb9477d49efb2931d45204e3efbcb78"
+  integrity sha512-UKYcC7fcSw6AUK6nlfm8A8WSOA41H3DRAwafCMp9CQpg3K9COAQKkrgQ+dKPhwkFTP7SPZNEiulDpPLwvr5QQQ==
   dependencies:
     "@azure/identity" "^4.1.0"
     "@vscode/vsce-sign" "^2.0.0"
@@ -3735,7 +3735,7 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unzipper@^0.12.2:
+unzipper@^0.12.3:
   version "0.12.3"
   resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.12.3.tgz#31958f5eed7368ed8f57deae547e5a673e984f87"
   integrity sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==
@@ -3797,15 +3797,15 @@ validator@^13.6.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b"
   integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
 
-vscode-extension-tester@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/vscode-extension-tester/-/vscode-extension-tester-8.5.0.tgz#7c8ad6e4790736678169c9da5b4d9f04c1d16f89"
-  integrity sha512-b4O53LQlBC6ZcQNzmkcBW5AhG/cD+odNpIPqNTMhDx7JIBgCq2fyJLLxNl9tDMDn05rqCHeXEOiwuReijlnz0g==
+vscode-extension-tester@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-extension-tester/-/vscode-extension-tester-8.6.0.tgz#d759d8dfb87f4fec3026a7f2b2a9cad9a22a89e3"
+  integrity sha512-7h1Hi4IcH7HokofFaEFC0/h1BlF7h6iZSKkNeOezv01lZMCBP3NSDy+3YP6oyT91D90g0L0iuiTduThfcwFcag==
   dependencies:
-    "@redhat-developer/locators" "^1.3.0"
-    "@redhat-developer/page-objects" "^1.3.0"
-    "@types/selenium-webdriver" "^4.1.24"
-    "@vscode/vsce" "^2.31.1"
+    "@redhat-developer/locators" "^1.4.0"
+    "@redhat-developer/page-objects" "^1.4.0"
+    "@types/selenium-webdriver" "^4.1.25"
+    "@vscode/vsce" "^3.0.0"
     c8 "^10.1.2"
     commander "^12.1.0"
     compare-versions "^6.1.1"
@@ -3818,7 +3818,7 @@ vscode-extension-tester@^8.5.0:
     sanitize-filename "^1.6.3"
     selenium-webdriver "^4.23.0"
     targz "^1.0.1"
-    unzipper "^0.12.2"
+    unzipper "^0.12.3"
 
 which@^2.0.1:
   version "2.0.2"