Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
sudhirverma committed Jul 30, 2020
1 parent 9b03617 commit 28eda41
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 18 deletions.
3 changes: 2 additions & 1 deletion src/pipeline/wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Disposable } from '../util/disposable';
import { debounce } from 'debounce';
import { TknResourceItem } from '../tekton/webviewstartpipeline';
import { TektonItem } from '../tekton/tektonitem';
import { startPipeline } from '../tekton/startpipeline';

export interface PipelineWizardInput {
readonly resourceColumn: vscode.ViewColumn;
Expand Down Expand Up @@ -53,7 +54,7 @@ export class PipelineWizard extends Disposable {
// eslint-disable-next-line no-case-declarations
const inputStartPipeline = e.body;
this.dispose();
return await TektonItem.startPipeline(inputStartPipeline);
return await startPipeline(inputStartPipeline);
}
}));

Expand Down
5 changes: 3 additions & 2 deletions src/tekton/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { TknPipelineTrigger } from '../tekton';
import { Trigger, PipelineContent } from './pipelinecontent';
import { PipelineWizard } from '../pipeline/wizard';
import { pipelineData } from './webviewstartpipeline';
import { startPipeline } from './startpipeline';

export class Pipeline extends TektonItem {

Expand Down Expand Up @@ -42,7 +43,7 @@ export class Pipeline extends TektonItem {
})).filter((obj) => obj.name === pipeline.getName());
const inputStartPipeline = await PipelineContent.startObject(pipelineTrigger, 'Pipeline');

return await Pipeline.startPipeline(inputStartPipeline);
return await startPipeline(inputStartPipeline);
} else {
Pipeline.startWizard(pipeline);
}
Expand Down Expand Up @@ -108,7 +109,7 @@ export class Pipeline extends TektonItem {
}
const trigger = await pipelineData(data);
if (!trigger.workspaces && !trigger.resources && !trigger.params) {
await Pipeline.startPipeline(trigger);
await startPipeline(trigger);
} else {
PipelineWizard.create({ trigger, resourceColumn: ViewColumn.Active }, ViewColumn.Active);
}
Expand Down
22 changes: 22 additions & 0 deletions src/tekton/startpipeline.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*-----------------------------------------------------------------------------------------------
* Copyright (c) Red Hat, Inc. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information.
*-----------------------------------------------------------------------------------------------*/

import { StartObject } from './pipelinecontent';
import { Progress } from '../util/progress';
import { TektonItem } from './tektonitem';
import { showPipelineRunPreview } from '../pipeline/pipeline-preview';



export function startPipeline(inputStartPipeline: StartObject): Promise<string> {
return Progress.execFunctionWithProgress(`Starting Pipeline '${inputStartPipeline.name}'.`, () =>
TektonItem.tkn.startPipeline(inputStartPipeline)
.then(() => TektonItem.explorer.refresh())
.then(() => !TektonItem.startQuickPick() ? TektonItem.ShowPipelineRun() ? TektonItem.tkn._getPipelineRuns(undefined ,inputStartPipeline.name) : undefined : undefined)
.then((value) => !TektonItem.startQuickPick() ? TektonItem.ShowPipelineRun() ? showPipelineRunPreview(value[0].getName()) : undefined : undefined)
.then(() => `Pipeline '${inputStartPipeline.name}' successfully started`)
.catch((error) => Promise.reject(`Failed to start Pipeline with error '${error}'`))
);
}
15 changes: 0 additions & 15 deletions src/tekton/tektonitem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ import { Tkn, tkn as tknImpl, TektonNode, ContextType } from '../tkn';
import { PipelineExplorer, pipelineExplorer } from '../pipeline/pipelineExplorer';
import { workspace, window } from 'vscode';
import { tektonFSUri } from '../util/tekton-vfs';
import { Progress } from '../util/progress';
import { PipelineWizard } from '../pipeline/wizard';
import { showPipelineRunPreview } from '../pipeline/pipeline-preview';
import { StartObject } from './pipelinecontent';

const errorMessage = {
Pipeline: 'You need at least one Pipeline available. Please create new Tekton Pipeline and try again.',
Expand Down Expand Up @@ -142,15 +138,4 @@ export abstract class TektonItem {
.getConfiguration('vs-tekton')
.get<boolean>('pipelineRun');
}

static startPipeline(inputStartPipeline: StartObject): Promise<string> {
return Progress.execFunctionWithProgress(`Starting Pipeline '${inputStartPipeline.name}'.`, () =>
TektonItem.tkn.startPipeline(inputStartPipeline)
.then(() => TektonItem.explorer.refresh())
.then(() => !TektonItem.startQuickPick() ? TektonItem.ShowPipelineRun() ? this.tkn._getPipelineRuns(undefined ,inputStartPipeline.name) : undefined : undefined)
.then((value) => !TektonItem.startQuickPick() ? TektonItem.ShowPipelineRun() ? showPipelineRunPreview(value[0].getName()) : undefined : undefined)
.then(() => `Pipeline '${inputStartPipeline.name}' successfully started`)
.catch((error) => Promise.reject(`Failed to start Pipeline with error '${error}'`))
);
}
}
17 changes: 17 additions & 0 deletions test/tekton/pipeline.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,23 @@ suite('Tekton/Pipeline', () => {


setup(() => {
sandbox.stub(vscode.workspace, 'getConfiguration').returns({
get<T>(): Promise<T|undefined> {
return Promise.resolve(undefined);
},
update(): Promise<void> {
return Promise.resolve();
},
inspect(): {
key: string;
} {
return undefined;
},
has(): boolean {
return true;
},
start: true
});
execStub = sandbox.stub(TknImpl.prototype, 'execute').resolves({ error: null, stdout: '', stderr: '' });
showQuickPickStub = sandbox.stub(vscode.window, 'showQuickPick').resolves(undefined);
sandbox.stub(TknImpl.prototype, 'getPipelines').resolves([pipelineItem]);
Expand Down

0 comments on commit 28eda41

Please sign in to comment.