From 7fd2cbe500025594e5093f37cbbaaa0c5e54710f Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Mon, 26 Jun 2017 12:41:02 -0400
Subject: [PATCH] Fixed unit tests after labels changes

---
 .../workflows/workflow-add.controller-test.js | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/awx/ui/tests/spec/workflows/workflow-add.controller-test.js b/awx/ui/tests/spec/workflows/workflow-add.controller-test.js
index a65f6991d9..c14ff714d1 100644
--- a/awx/ui/tests/spec/workflows/workflow-add.controller-test.js
+++ b/awx/ui/tests/spec/workflows/workflow-add.controller-test.js
@@ -10,14 +10,14 @@ describe('Controller: WorkflowAdd', () => {
         GenerateForm,
         TemplatesService,
         q,
-        getLabelsDeferred,
         createWorkflowJobTemplateDeferred,
         httpBackend,
         ProcessErrors,
         CreateSelect2,
         Wait,
         ParseTypeChange,
-        ToJSON;
+        ToJSON,
+        availableLabels;
 
     beforeEach(angular.mock.module('Tower'));
     beforeEach(angular.mock.module('RestServices'));
@@ -45,6 +45,11 @@ describe('Controller: WorkflowAdd', () => {
             }
         };
 
+        availableLabels = [{
+            name: "foo",
+            id: "1"
+        }];
+
         ClearScope = jasmine.createSpy('ClearScope');
         Alert = jasmine.createSpy('Alert');
         ProcessErrors = jasmine.createSpy('ProcessErrors');
@@ -62,9 +67,10 @@ describe('Controller: WorkflowAdd', () => {
         $provide.value('Wait', Wait);
         $provide.value('ParseTypeChange', ParseTypeChange);
         $provide.value('ToJSON', ToJSON);
+        $provide.value('availableLabels', availableLabels);
     }));
 
-    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, $httpBackend, _state_, _ConfigService_, _ClearScope_, _GetChoices_, _Alert_, _GenerateForm_, _ProcessErrors_, _CreateSelect2_, _Wait_, _ParseTypeChange_, _ToJSON_) => {
+    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, $httpBackend, _state_, _ConfigService_, _ClearScope_, _GetChoices_, _Alert_, _GenerateForm_, _ProcessErrors_, _CreateSelect2_, _Wait_, _ParseTypeChange_, _ToJSON_, _availableLabels_) => {
         scope = $rootScope.$new();
         state = _state_;
         q = $q;
@@ -75,10 +81,10 @@ describe('Controller: WorkflowAdd', () => {
         ProcessErrors = _ProcessErrors_;
         CreateSelect2 = _CreateSelect2_;
         Wait = _Wait_;
-        getLabelsDeferred = q.defer();
         createWorkflowJobTemplateDeferred = q.defer();
         ParseTypeChange = _ParseTypeChange_;
         ToJSON = _ToJSON_;
+        availableLabels = _availableLabels_;
 
         $httpBackend
             .whenGET(/^\/api\/?$/)
@@ -88,7 +94,6 @@ describe('Controller: WorkflowAdd', () => {
             .whenGET(/\/static\/*/)
             .respond(200, {});
 
-        TemplatesService.getLabelOptions = jasmine.createSpy('getLabelOptions').and.returnValue(getLabelsDeferred.promise);
         TemplatesService.createWorkflowJobTemplate = jasmine.createSpy('createWorkflowJobTemplate').and.returnValue(createWorkflowJobTemplateDeferred.promise);
 
         WorkflowAdd = $controller('WorkflowAdd', {
@@ -102,6 +107,7 @@ describe('Controller: WorkflowAdd', () => {
             CreateSelect2: CreateSelect2,
             Wait: Wait,
             ParseTypeChange: ParseTypeChange,
+            availableLabels: availableLabels,
             ToJSON
         });
     }));
@@ -111,16 +117,13 @@ describe('Controller: WorkflowAdd', () => {
     });
 
     it('should get/set the label options and select2-ify the input', ()=>{
-        // Resolve TemplatesService.getLabelsForJobTemplate
-        getLabelsDeferred.resolve({
-            foo: "bar"
-        });
         // We expect the digest cycle to fire off this call to /static/config.js so we go ahead and handle it
         httpBackend.expectGET('/static/config.js').respond(200);
         scope.$digest();
-        expect(scope.labelOptions).toEqual({
-            foo: "bar"
-        });
+        expect(scope.labelOptions).toEqual([{
+            label: "foo",
+            value: "1"
+        }]);
         expect(CreateSelect2).toHaveBeenCalledWith({
             element:'#workflow_job_template_labels',
             multiple: true,
@@ -128,18 +131,6 @@ describe('Controller: WorkflowAdd', () => {
         });
     });
 
-    it('should call ProcessErrors when getLabelsForJobTemplate returns a rejected promise', ()=>{
-        // Reject TemplatesService.getLabelsForJobTemplate
-        getLabelsDeferred.reject({
-            data: "mockedData",
-            status: 400
-        });
-        // We expect the digest cycle to fire off this call to /static/config.js so we go ahead and handle it
-        httpBackend.expectGET('/static/config.js').respond(200);
-        scope.$digest();
-        expect(ProcessErrors).toHaveBeenCalled();
-    });
-
     describe('scope.formSave()', () => {
 
         it('should call TemplatesService.createWorkflowJobTemplate', ()=>{