Fix tests to reflect changes in odo watch command execution

Signed-off-by: Denis Golovin <[email protected]>

Author: dgolovin

src/odo.ts

@@ -49,6 +49,7 @@ export interface OpenShiftObject extends QuickPickItem {
     contextPath?: Uri;
     path?: string;
     builderImage?: BuilderImage;
+    iconPath?: Uri;
 }
 
 export enum ContextType {
@@ -404,8 +405,6 @@ class OdoModel {
         array.splice(array.indexOf(item), 1);
         this.pathToObject.delete(item.path);
         this.contextToObject.delete(item.contextPath.fsPath);
-        const ps = this.objectToProcess.get(item);
-        if (ps) ps.kill('SIGINT');
     }
 
     public deleteContext(context: string): void {

src/openshift/component.ts

@@ -501,7 +501,7 @@ export class Component extends OpenShiftItem {
                 commands.executeCommand('openshift.component.watch.showLog', component.contextPath.fsPath);
             }
         } else {
-            const process :ChildProcess = await Component.odo.spawn(Command.watchComponent(component.getParent().getParent().getName(), component.getParent().getName(), component.getName()), component.contextPath.fsPath);
+            const process: ChildProcess = await Component.odo.spawn(Command.watchComponent(component.getParent().getParent().getName(), component.getParent().getName(), component.getName()), component.contextPath.fsPath);
             Component.addWatchSession(component, process);
             process.on('exit', () => {
                 Component.removeWatchSession(component);

src/watch.ts

@@ -73,7 +73,8 @@ export class WatchSessionsView implements TreeDataProvider<string>, Disposable {
         return {
             label: WatchSessionsView.sessions.get(element).label,
             collapsibleState: TreeItemCollapsibleState.None,
-            contextValue: 'openshift.watch.process'
+            contextValue: 'openshift.watch.process',
+            iconPath: WatchSessionsView.odoctl.getOpenShiftObjectByContext(element).iconPath
         };
     }
 

test/unit/openshift/component.test.ts

@@ -8,6 +8,7 @@ import * as vscode from 'vscode';
 import * as chai from 'chai';
 import * as sinonChai from 'sinon-chai';
 import * as sinon from 'sinon';
+import { ChildProcess } from 'child_process';
 import { TestItem } from './testOSItem';
 import { OdoImpl, ContextType } from '../../../src/odo';
 import { Command } from "../../../src/odo/command";
@@ -19,6 +20,7 @@ import OpenShiftItem from '../../../src/openshift/openshiftItem';
 import pq = require('proxyquire');
 import globby = require('globby');
 
+
 const {expect} = chai;
 chai.use(sinonChai);
 
@@ -43,6 +45,7 @@ suite('OpenShift/Component', () => {
     let Component: any;
     let fetchTag: sinon.SinonStub;
     let commandStub: sinon.SinonStub;
+    let spawnStub: sinon.SinonStub;
 
     setup(() => {
         sandbox = sinon.createSandbox();
@@ -51,6 +54,7 @@ suite('OpenShift/Component', () => {
         Component = pq('../../../src/openshift/component', {}).Component;
         termStub = sandbox.stub(OdoImpl.prototype, 'executeInTerminal');
         execStub = sandbox.stub(OdoImpl.prototype, 'execute').resolves({ stdout: "" });
+        spawnStub = sandbox.stub(OdoImpl.prototype, 'spawn');
         sandbox.stub(OdoImpl.prototype, 'getServices');
         sandbox.stub(OdoImpl.prototype, 'getProjects').resolves([]);
         sandbox.stub(OdoImpl.prototype, 'getApplications').resolves([]);
@@ -1122,15 +1126,17 @@ suite('OpenShift/Component', () => {
         });
 
         test('calls the correct odo command w/ context', async () => {
+            const cpStub = {on: sinon.stub()} as any as ChildProcess;
+            spawnStub.resolves(cpStub);
             await Component.watch(componentItem);
-
-            expect(termStub).calledOnceWith(Command.watchComponent(projectItem.getName(), appItem.getName(), componentItem.getName()));
+            expect(spawnStub).calledOnceWith(Command.watchComponent(projectItem.getName(), appItem.getName(), componentItem.getName()));
         });
 
         test('calls the correct odo command w/o context', async () => {
+            const cpStub = {on: sinon.stub()} as any as ChildProcess;
+            spawnStub.resolves(cpStub);
             await Component.watch(null);
-
-            expect(termStub).calledOnceWith(Command.watchComponent(projectItem.getName(), appItem.getName(), componentItem.getName()));
+            expect(spawnStub).calledOnceWith(Command.watchComponent(projectItem.getName(), appItem.getName(), componentItem.getName()));
         });
     });