Merge branch 'main' into feature/bugfix

Author: vlad-dargel

src/server/bootstrapBackendE2E.ts

@@ -51,11 +51,13 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
           + `$env:RI_STDOUT_LOGGER=${process.env.RI_STDOUT_LOGGER};`
           + `$env:RI_BUILD_TYPE=${process.env.RI_BUILD_TYPE};`
           + `$env:RI_SEGMENT_WRITE_KEY=${process.env.RI_SEGMENT_WRITE_KEY};`
+          + `$env:RI_MIGRATE_OLD_FOLDERS=${process.env.RI_MIGRATE_OLD_FOLDERS};`
+          + '$env:RI_AUTO_BOOTSTRAP=true;'
           + `node ${backendSrcPath}`,
         ])
       } else {
         PSinst = cp.spawn(
-          'node', [path.resolve(backendPath, 'src/main.js')],
+          'node', [path.resolve(backendPath, 'main.js')],
           {
             env:
             {
@@ -66,6 +68,8 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
               RI_STDOUT_LOGGER: process.env.RI_STDOUT_LOGGER,
               RI_BUILD_TYPE: process.env.RI_BUILD_TYPE,
               RI_SEGMENT_WRITE_KEY: process.env.RI_SEGMENT_WRITE_KEY,
+              RI_MIGRATE_OLD_FOLDERS: process.env.RI_MIGRATE_OLD_FOLDERS,
+              RI_AUTO_BOOTSTRAP: 'true',
               PATH: process.env.PATH,
             },
           },

tests/e2e/src/helpers/Conf.ts

@@ -9,11 +9,11 @@ export class Config {
   static apiUrl = process.env.API_URL || 'http://127.0.0.1:5541/api'
   static vscodeVersion = process.env.VSCODE_VERSION || '1.87.2'
   static extensionName =
-    process.env.EXTENSION_NAME || 'redis-insight-vsc-extension.vsix'
+    process.env.EXTENSION_NAME || 'redis-for-vscode-extension.vsix'
 
   static workingDirectory =
     process.env.APP_FOLDER_ABSOLUTE_PATH ||
-    joinPath(os.homedir(), process.env.APP_FOLDER_NAME || '.redis-insight-vsc')
+    joinPath(os.homedir(), process.env.APP_FOLDER_NAME || '.redis-for-vscode')
   static fileDownloadPath = joinPath(os.homedir(), 'Downloads')
   static uniqueId = chance.string({ length: 10 })
 

tests/e2e/src/vscode.runner.ts

@@ -25,13 +25,13 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
       __dirname,
       '..',
       'test-extensions',
-      `redis ltd..${Config.extensionName.replace('.vsix', '')}`,
+      `${Config.extensionName.replace('.vsix', '')}`,
     )
     const extensionProcessPath = path.join(
       __dirname,
       '..',
       'test-extensions',
-      'redis.redis-insight-vsc-plugin-0.0.1',
+      'redis.redis-for-vscode-0.0.2',
       'dist',
       'redis-backend',
       'dist',