From 1af972fc39ea12eb337bfae394080a28e2b44b48 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 19 May 2017 13:33:40 -0400 Subject: [PATCH] Fixed failing ui unit tests --- awx/ui/tests/spec/smart-search/queryset.service-test.js | 2 +- .../spec/workflow--results/workflow-results.service-test.js | 6 +++--- awx/ui/tests/spec/workflows/workflow-add.controller-test.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/tests/spec/smart-search/queryset.service-test.js b/awx/ui/tests/spec/smart-search/queryset.service-test.js index 6fa8dbcab5..c558f82233 100644 --- a/awx/ui/tests/spec/smart-search/queryset.service-test.js +++ b/awx/ui/tests/spec/smart-search/queryset.service-test.js @@ -31,7 +31,7 @@ describe('Service: QuerySet', () => { // @todo: improve appsource // provide api version via package.json config block $httpBackend - .whenGET('/api') + .whenGET(/^\/api\/?$/) .respond(200, ''); })); diff --git a/awx/ui/tests/spec/workflow--results/workflow-results.service-test.js b/awx/ui/tests/spec/workflow--results/workflow-results.service-test.js index 9010de6d7f..8f0e2ad843 100644 --- a/awx/ui/tests/spec/workflow--results/workflow-results.service-test.js +++ b/awx/ui/tests/spec/workflow--results/workflow-results.service-test.js @@ -23,7 +23,7 @@ describe('workflowResultsService', () => { let ticks = 0; let ticks_expected = 10; - workflowResultsService.createOneSecondTimer(moment(), function(time) { + workflowResultsService.createOneSecondTimer(moment(), function() { ticks += 1; if (ticks >= ticks_expected) { expect(ticks).toBe(ticks_expected); @@ -36,7 +36,7 @@ describe('workflowResultsService', () => { $interval.flush(ticks_expected * 1000); }); }); - + describe('destroyTimer()', () => { beforeEach(() => { $interval.cancel = jasmine.createSpy('cancel'); @@ -56,4 +56,4 @@ describe('workflowResultsService', () => { expect($interval.cancel).toHaveBeenCalledWith(timer); }); }); -}); \ No newline at end of file +}); 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 57e9e6ca6c..a65f6991d9 100644 --- a/awx/ui/tests/spec/workflows/workflow-add.controller-test.js +++ b/awx/ui/tests/spec/workflows/workflow-add.controller-test.js @@ -80,8 +80,8 @@ describe('Controller: WorkflowAdd', () => { ParseTypeChange = _ParseTypeChange_; ToJSON = _ToJSON_; - httpBackend - .whenGET('/api') + $httpBackend + .whenGET(/^\/api\/?$/) .respond(200, ''); $httpBackend