chore: devWorkspace should be initialized properly if there is no plu…

…gins/extensions provided Signed-off-by: Vitaliy Gulyy <[email protected]>
eclipse-che · Jun 8, 2022 · 17abbf1 · 17abbf1
1 parent e60a2df
commit 17abbf1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tools/devworkspace-handler/src/devfile/che-theia-plugins-devfile-resolver.ts b/tools/devworkspace-handler/src/devfile/che-theia-plugins-devfile-resolver.ts
@@ -58,8 +58,10 @@ export class CheTheiaPluginsDevfileResolver implements DevfileResolver {
       cheTheiaPluginsYamlContent = devfileContext.devfile.attributes?.['.che/che-theia-plugins.yaml'];
     }
 
-    // no content, skip
+    // no content
     if (!cheTheiaPluginsYamlContent && !vscodeExtensionJsonContent) {
+      // we have to update the workspace anyway, but without extensions
+      await this.devWorkspaceUpdater.update(devfileContext, [], [], { extensions: [] });
       return;
     }
 

diff --git a/tools/devworkspace-handler/tests/devfile/che-theia-plugins-devfile-resolver.spec.ts b/tools/devworkspace-handler/tests/devfile/che-theia-plugins-devfile-resolver.spec.ts
@@ -492,7 +492,7 @@ describe('Test CheTheiaPluginsDevfileResolver', () => {
     expect(cheTheiaPluginSidecarMergerMergeSpy).toBeCalledTimes(0);
     expect(cheTheiaPluginDevContainerMergerMergeSpy).toBeCalledTimes(0);
 
-    // no update
-    expect(devWorkspaceUpdaterUpdateMethod).toBeCalledTimes(0);
+    // devWorkspace should be updated
+    expect(devWorkspaceUpdaterUpdateMethod).toBeCalledTimes(1);
   });
 });