chore: Adapt lancher's tests to the upstream changes

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED

launcher/tests/devworkspace-id.spec.ts

@@ -13,11 +13,11 @@ import { env } from 'process';
 
 import { DevWorkspaceId } from '../src/devworkspace-id';
 
-const ORIGIN_WORKBENCH_WEB_MAIN = `
+const ORIGIN_WORKBENCH = `
 some code, some code, a mask to be replaced https://{{che-cluster}}.{{host}}/{{namespace}}/{{workspace-name}}/{{port}}/, some code
 `;
 
-const NEW_WORKBENCH_WEB_MAIN = `
+const NEW_WORKBENCH = `
 some code, some code, a mask to be replaced test-workspace-1234567890, some code
 `;
 
@@ -49,12 +49,12 @@ describe('Test setting DevWorkspace ID to VS Code', () => {
       writeFile: writeFileMock,
     });
 
-    readFileMock.mockImplementation(() => ORIGIN_WORKBENCH_WEB_MAIN);
+    readFileMock.mockImplementation(() => ORIGIN_WORKBENCH);
 
     const devWorkspaceId = new DevWorkspaceId();
     await devWorkspaceId.configure();
 
     expect(readFileMock).toBeCalledTimes(1);
-    expect(writeFileMock).toBeCalledWith('out/vs/workbench/workbench.web.main.internal.js', NEW_WORKBENCH_WEB_MAIN);
+    expect(writeFileMock).toBeCalledWith('out/vs/code/browser/workbench/workbench.js', NEW_WORKBENCH);
   });
 });

launcher/tests/openvsix-registry.spec.ts

@@ -66,29 +66,29 @@ describe('Test Configuring of OpenVSIX registry:', () => {
     // it must be cut when forming a registry URL
     env.OPENVSX_REGISTRY_URL = 'https://test-openvsx.org/';
 
-    const fileWorkbenchWebMain = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.web.main.internal.js'));
+    const fileWorkbench = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.js'));
 
-    const fileWorkbenchWebMainExpected = await fs.readFile(
-      path.resolve(__dirname, '_data', 'workbench.web.main.test-openvsix-registry.js')
+    const fileWorkbenchExpected = await fs.readFile(
+      path.resolve(__dirname, '_data', 'workbench.test-openvsix-registry.js')
     );
 
     let savedProductJson;
-    let savedWorkbenchWebMain;
+    let savedWorkbench;
 
     Object.assign(fs, {
       readFile: async (file: string) => {
         if ('product.json' === file) {
           return ORIGINAL_PRODUCT_JSON;
-        } else if ('out/vs/workbench/workbench.web.main.internal.js' === file) {
-          return fileWorkbenchWebMain;
+        } else if ('out/vs/code/browser/workbench/workbench.js' === file) {
+          return fileWorkbench;
         }
       },
 
       writeFile: async (file: string, data: string) => {
         if ('product.json' === file) {
           savedProductJson = data;
-        } else if ('out/vs/workbench/workbench.web.main.internal.js' === file) {
-          savedWorkbenchWebMain = data;
+        } else if ('out/vs/code/browser/workbench/workbench.js' === file) {
+          savedWorkbench = data;
         }
       },
     });
@@ -98,7 +98,7 @@ describe('Test Configuring of OpenVSIX registry:', () => {
     await openVSIXRegistry.configure();
 
     expect(savedProductJson).toBe(TEST_APPLY_OPENVSIX_REISTRY);
-    expect(savedWorkbenchWebMain).toBe(fileWorkbenchWebMainExpected);
+    expect(savedWorkbench).toBe(fileWorkbenchExpected);
   });
 
   test('should proceed with CHE_PLUGIN_REGISTRY_URL if OPENVSX_REGISTRY_URL is empty', async () => {
@@ -107,29 +107,29 @@ describe('Test Configuring of OpenVSIX registry:', () => {
     // it must be cut when forming a registry URL
     env.CHE_PLUGIN_REGISTRY_URL = 'https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/plugin-registry/v3/';
 
-    const fileWorkbenchWebMain = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.web.main.internal.js'));
+    const fileWorkbench = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.js'));
 
-    const fileWorkbenchWebMainExpected = await fs.readFile(
-      path.resolve(__dirname, '_data', 'workbench.web.main.test-che-plugin-registry.js')
+    const fileWorkbenchExpected = await fs.readFile(
+      path.resolve(__dirname, '_data', 'workbench.test-che-plugin-registry.js')
     );
 
     let savedProductJson;
-    let savedWorkbenchWebMain;
+    let savedWorkbench;
 
     Object.assign(fs, {
       readFile: async (file: string) => {
         if ('product.json' === file) {
           return ORIGINAL_PRODUCT_JSON;
-        } else if ('out/vs/workbench/workbench.web.main.internal.js' === file) {
-          return fileWorkbenchWebMain;
+        } else if ('out/vs/code/browser/workbench/workbench.js' === file) {
+          return fileWorkbench;
         }
       },
 
       writeFile: async (file: string, data: string) => {
         if ('product.json' === file) {
           savedProductJson = data;
-        } else if ('out/vs/workbench/workbench.web.main.internal.js' === file) {
-          savedWorkbenchWebMain = data;
+        } else if ('out/vs/code/browser/workbench/workbench.js' === file) {
+          savedWorkbench = data;
         }
       },
     });
@@ -139,7 +139,7 @@ describe('Test Configuring of OpenVSIX registry:', () => {
     await openVSIXRegistry.configure();
 
     expect(savedProductJson).toBe(TEST_APPLY_CHE_PLUGIN_REISTRY);
-    expect(savedWorkbenchWebMain).toBe(fileWorkbenchWebMainExpected);
+    expect(savedWorkbench).toBe(fileWorkbenchExpected);
   });
 
   test('should skip if OPENVSX_REGISTRY_URL is empty but CHE_PLUGIN_REGISTRY_URL is not set', async () => {

launcher/tests/webview-resources.spec.ts

@@ -32,11 +32,11 @@ describe('Test Configuring of WebView static resources:', () => {
 
     // the second path tests the functionality of the WebviewResources module
 
-    // load "out/vs/workbench/workbench.web.main.internal.js"
-    const fileWorkbenchWebMain = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.web.main.internal.js'));
+    // load "out/vs/code/browser/workbench/workbench.js"
+    const fileWorkbench = await fs.readFile(path.resolve(__dirname, '_data', 'workbench.js'));
 
-    const fileWorkbenchWebMainExpected = await fs.readFile(
-      path.resolve(__dirname, '_data', 'workbench.web.main.test-webview-resources.js')
+    const fileWorkbenchExpected = await fs.readFile(
+      path.resolve(__dirname, '_data', 'workbench.test-webview-resources.js')
     );
 
     // load "out/vs/workbench/api/node/extensionHostProcess.js"
@@ -63,8 +63,8 @@ describe('Test Configuring of WebView static resources:', () => {
         case 'product.json':
           return fileProductJSON;
 
-        case 'out/vs/workbench/workbench.web.main.internal.js':
-          return fileWorkbenchWebMain;
+        case 'out/vs/code/browser/workbench/workbench.js':
+          return fileWorkbench;
 
         case 'out/vs/workbench/api/node/extensionHostProcess.js':
           return fileExtensionHostProcess;
@@ -73,14 +73,14 @@ describe('Test Configuring of WebView static resources:', () => {
       return undefined;
     });
 
-    let gotFileWorkbenchWebMain;
+    let gotFileWorkbench;
     let gotFileExtensionHostProcess;
 
     const writeFileMock = jest.fn();
     writeFileMock.mockImplementation(async (fileName: string, data: string) => {
       switch (fileName) {
-        case 'out/vs/workbench/workbench.web.main.internal.js':
-          gotFileWorkbenchWebMain = data;
+        case 'out/vs/code/browser/workbench/workbench.js':
+          gotFileWorkbench = data;
 
         case 'out/vs/workbench/api/node/extensionHostProcess.js':
           gotFileExtensionHostProcess = data;
@@ -97,7 +97,7 @@ describe('Test Configuring of WebView static resources:', () => {
     expect(updateMock).toHaveBeenCalledTimes(2);
 
     expect(updateMock).toHaveBeenCalledWith(
-      'out/vs/workbench/workbench.web.main.internal.js',
+      'out/vs/code/browser/workbench/workbench.js',
       'https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/',
       'https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/vgulyy/che-code-multiroot/3100/oss-dev/static/out/vs/workbench/contrib/webview/browser/pre/'
     );
@@ -108,7 +108,7 @@ describe('Test Configuring of WebView static resources:', () => {
       'https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/vgulyy/che-code-multiroot/3100/oss-dev/static/out/vs/workbench/contrib/webview/browser/pre/'
     );
 
-    expect(fileWorkbenchWebMainExpected).toBe(gotFileWorkbenchWebMain);
+    expect(fileWorkbenchExpected).toBe(gotFileWorkbench);
     expect(fileExtensionHostProcessExpected).toBe(gotFileExtensionHostProcess);
   });
 });

launcher/tsconfig.json

@@ -31,9 +31,9 @@
         "tests"
     ],
     "exclude": [
-        "tests/_data/workbench.web.main.internal.js",
-        "tests/_data/workbench.web.main.test-che-plugin-registry.js",
-        "tests/_data/workbench.web.main.test-openvsix-registry.js",
-        "tests/_data/workbench.web.main.test-webview-resources.js"
+        "tests/_data/workbench.js",
+        "tests/_data/workbench.test-che-plugin-registry.js",
+        "tests/_data/workbench.test-openvsix-registry.js",
+        "tests/_data/workbench.test-webview-resources.js"
     ]
 }