From 0af574e213c3830ee227bfcd7218e0edeed88056 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 23 Jan 2017 17:06:48 -0500 Subject: [PATCH] Actually fixed the unit tests this time --- .../workflow-maker.controller-test.js | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/awx/ui/tests/spec/workflows/workflow-maker.controller-test.js b/awx/ui/tests/spec/workflows/workflow-maker.controller-test.js index 584e06d3d5..d4062bbaba 100644 --- a/awx/ui/tests/spec/workflows/workflow-maker.controller-test.js +++ b/awx/ui/tests/spec/workflows/workflow-maker.controller-test.js @@ -4,22 +4,22 @@ describe('Controller: WorkflowMaker', () => { // Setup let scope, WorkflowMakerController, - WorkflowHelpService; + TemplatesService, + q, + getWorkflowJobTemplateNodesDeferred; beforeEach(angular.mock.module('Tower')); - beforeEach(angular.mock.module('templates', ($provide) => { + beforeEach(angular.mock.module('templates', () => { - WorkflowHelpService = jasmine.createSpyObj('WorkflowHelpService', [ - 'closeDialog', - 'addPlaceholderNode', - 'getSiblingConnectionTypes' - ]); - - $provide.value('WorkflowHelpService', WorkflowHelpService); + TemplatesService = { + getWorkflowJobTemplateNodes: function(){ + return angular.noop; + } + }; })); - beforeEach(angular.mock.inject( ($rootScope, $controller, _WorkflowHelpService_) => { + beforeEach(angular.mock.inject( ($rootScope, $controller, $q) => { scope = $rootScope.$new(); scope.closeDialog = jasmine.createSpy(); scope.treeData = { @@ -41,13 +41,13 @@ describe('Controller: WorkflowMaker', () => { scope.workflowJobTemplateObj = { id: 1 }; - WorkflowHelpService = _WorkflowHelpService_; - + q = $q; + getWorkflowJobTemplateNodesDeferred = q.defer(); + TemplatesService.getWorkflowJobTemplateNodes = jasmine.createSpy('getWorkflowJobTemplateNodes').and.returnValue(getWorkflowJobTemplateNodesDeferred.promise); WorkflowMakerController = $controller('WorkflowMakerController', { $scope: scope, - WorkflowHelpService: WorkflowHelpService + TemplatesService: TemplatesService }); - })); describe('scope.closeWorkflowMaker()', () => {