Removed console.logs and cleaned up some unit test related errors

awx/ui/client/src/job-templates/list/job-templates-list.controller.js

@@ -55,9 +55,9 @@ export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest', 'Al
                         Alert('Error: Unable to determine template type', 'We were unable to determine this template\'s type while routing to edit.');
                     }
                 }
-                else {
+            else {
-                    Alert('Error: Unable to edit template', 'Template parameter is missing');
+                Alert('Error: Unable to edit template', 'Template parameter is missing');
-                }
+            }
         };
 
         $scope.deleteJobTemplate = function(template) {

awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js

@@ -127,7 +127,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
 
         };
 
-        $scope.confirmNodeForm = function(formValues) {console.log(formValues);
+        $scope.confirmNodeForm = function(formValues) {
             if ($scope.workflowMakerFormConfig.nodeMode === "add") {
                 if ($scope.selectedTemplate && formValues.edgeType) {
 
@@ -178,7 +178,7 @@ export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateLis
                             job_type: formValues.job_type && formValues.job_type.value ? formValues.job_type.value : null,
                             job_tags: formValues.job_tags,
                             skip_tags: formValues.skip_tags
-                        };console.log($scope.nodeBeingEdited.promptValues);
+                        };
                     }
 
                     $scope.nodeBeingEdited.isActiveEdit = false;

awx/ui/tests/spec/job-templates/job-templates-list.controller-test.js

@@ -5,7 +5,7 @@ describe('Controller: JobTemplatesList', () => {
     let scope,
         rootScope,
         state,
-        JobTemplatesList,
+        JobTemplatesListController,
         ClearScope,
         GetChoices,
         Alert,
@@ -16,7 +16,8 @@ describe('Controller: JobTemplatesList', () => {
         q,
         JobTemplateService,
         deleteWorkflowJobTemplateDeferred,
-        deleteJobTemplateDeferred;
+        deleteJobTemplateDeferred,
+        Dataset;
 
     beforeEach(angular.mock.module('Tower'));
     beforeEach(angular.mock.module('jobTemplates', ($provide) => {
@@ -46,6 +47,12 @@ describe('Controller: JobTemplatesList', () => {
             }
         };
 
+        Dataset = {
+            data: {
+                results: []
+            }
+        };
+
         ClearScope = jasmine.createSpy('ClearScope');
         GetChoices = jasmine.createSpy('GetChoices');
         Alert = jasmine.createSpy('Alert');
@@ -81,7 +88,7 @@ describe('Controller: JobTemplatesList', () => {
         JobTemplateService.deleteWorkflowJobTemplate = jasmine.createSpy('deleteWorkflowJobTemplate').and.returnValue(deleteWorkflowJobTemplateDeferred.promise);
         JobTemplateService.deleteJobTemplate = jasmine.createSpy('deleteJobTemplate').and.returnValue(deleteJobTemplateDeferred.promise);
 
-        JobTemplatesList = $controller('JobTemplatesList', {
+        JobTemplatesListController = $controller('JobTemplatesListController', {
             $scope: scope,
             $rootScope: rootScope,
             $state: state,
@@ -91,14 +98,11 @@ describe('Controller: JobTemplatesList', () => {
             Prompt: Prompt,
             InitiatePlaybookRun: InitiatePlaybookRun,
             rbacUiControlService: rbacUiControlService,
-            JobTemplateService: JobTemplateService
+            JobTemplateService: JobTemplateService,
+            Dataset: Dataset
         });
     }));
 
-    it('should call GetChoices', ()=> {
-        expect(GetChoices).toHaveBeenCalled();
-    });
-
     describe('scope.editJobTemplate()', () => {
 
         it('should call Alert when template param is not present', ()=>{
@@ -114,7 +118,7 @@ describe('Controller: JobTemplatesList', () => {
             };
 
             scope.editJobTemplate(testTemplate);
-            expect(state.transitionTo).toHaveBeenCalledWith('templates.editJobTemplate', {id: 1});
+            expect(state.transitionTo).toHaveBeenCalledWith('templates.editJobTemplate', {job_template_id: 1});
         });
 
         it('should transition to templates.templates.editWorkflowJobTemplate when type is "Workflow Job Template"', ()=>{
@@ -125,7 +129,7 @@ describe('Controller: JobTemplatesList', () => {
             };
 
             scope.editJobTemplate(testTemplate);
-            expect(state.transitionTo).toHaveBeenCalledWith('templates.editWorkflowJobTemplate', {id: 1});
+            expect(state.transitionTo).toHaveBeenCalledWith('templates.editWorkflowJobTemplate', {workflow_job_template_id: 1});
         });
 
         it('should call Alert when type is not "Job Template" or "Workflow Job Template"', ()=>{

awx/ui/tests/spec/workflows/workflow-add.controller-test.js

@@ -8,7 +8,6 @@ describe('Controller: WorkflowAdd', () => {
         ClearScope,
         Alert,
         GenerateForm,
-        initSurvey,
         JobTemplateService,
         q,
         getLabelsDeferred,
@@ -32,7 +31,8 @@ describe('Controller: WorkflowAdd', () => {
         GenerateForm = jasmine.createSpyObj('GenerateForm', [
             'inject',
             'reset',
-            'clearApiErrors'
+            'clearApiErrors',
+            'applyDefaults'
         ]);
 
         JobTemplateService = {
@@ -101,14 +101,6 @@ describe('Controller: WorkflowAdd', () => {
         expect(ClearScope).toHaveBeenCalled();
     });
 
-    it('should call GenerateForm.inject', ()=>{
-        expect(GenerateForm.inject).toHaveBeenCalled();
-    });
-
-    it('should call GenerateForm.reset', ()=>{
-        expect(GenerateForm.reset).toHaveBeenCalled();
-    });
-
     it('should get/set the label options and select2-ify the input', ()=>{
         // Resolve JobTemplateService.getLabelsForJobTemplate
         getLabelsDeferred.resolve({
@@ -121,7 +113,7 @@ describe('Controller: WorkflowAdd', () => {
             foo: "bar"
         });
         expect(CreateSelect2).toHaveBeenCalledWith({
-            element:'#workflow_labels',
+            element:'#workflow_job_template_labels',
             multiple: true,
             addNew: true
         });

awx/ui/tests/spec/workflows/workflow-maker.controller-test.js

@@ -21,6 +21,22 @@ describe('Controller: WorkflowMaker', () => {
 
     beforeEach(angular.mock.inject( ($rootScope, $controller, _WorkflowHelpService_) => {
         scope = $rootScope.$new();
+        scope.treeData = {
+            data: {
+                id: 1,
+                canDelete: false,
+                canEdit: false,
+                canAddTo: true,
+                isStartNode: true,
+                unifiedJobTemplate: {
+                    name: "Workflow Launch"
+                },
+                children: [],
+                deletedNodes: [],
+                totalNodes: 0
+            },
+            nextIndex: 2
+        };
         WorkflowHelpService = _WorkflowHelpService_;
 
         WorkflowMakerController = $controller('WorkflowMakerController', {
@@ -38,48 +54,5 @@ describe('Controller: WorkflowMaker', () => {
         });
 
     });
-
+    
-    describe('scope.startAddNode()', () => {
-        
-    });
-
-    describe('scope.confirmNodeForm()', () => {
-
-    });
-
-    describe('scope.cancelNodeForm()', () => {
-
-    });
-
-    describe('scope.startEditNode()', () => {
-
-    });
-
-    describe('scope.startDeleteNode()', () => {
-
-    });
-
-    describe('scope.cancelDeleteNode()', () => {
-
-    });
-
-    describe('scope.confirmDeleteNode()', () => {
-
-    });
-
-    describe('scope.toggleFormTab()', () => {
-
-    });
-
-    describe('scope.toggle_job_template()', () => {
-
-    });
-
-    describe('scope.toggle_project()', () => {
-
-    });
-
-    describe('scope.toggle_inventory_source()', () => {
-
-    });
 });