Skip to content

Commit

Permalink
test(resolve): Fix "red code"
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Aug 31, 2016
1 parent 7a9e383 commit 8d6090e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
6 changes: 0 additions & 6 deletions test/core/resolveSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,5 @@ describe('Resolvables system:', function () {
}).then(done);
});
});

// TODO: test injection of annotated functions
// TODO: test injection of services
// TODO: test injection of other locals
// TODO: Implement and test injection to onEnter/Exit
// TODO: Implement and test injection into controllers
});

8 changes: 5 additions & 3 deletions test/ng1/resolveSpec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import "../testUtilsNg1.js";
declare var resolvedValue, resolvedError, caught;

import "../matchers.ts";

import {
Expand Down Expand Up @@ -190,9 +192,9 @@ describe("$resolve", function () {
});

it("resolves dependencies between functions that return promises", inject(function ($q) {
var ad = $q.defer(), a = jasmine.createSpy('a').and.returnValue(ad.promise);
var bd = $q.defer(), b = jasmine.createSpy('b').and.returnValue(bd.promise);
var cd = $q.defer(), c = jasmine.createSpy('c').and.returnValue(cd.promise);
var ad = $q.defer(), a = jasmine.createSpy('a'); a.and.returnValue(ad.promise);
var bd = $q.defer(), b = jasmine.createSpy('b'); b.and.returnValue(bd.promise);
var cd = $q.defer(), c = jasmine.createSpy('c'); c.and.returnValue(cd.promise);

var r = $r.resolve({ a: [ 'b', 'c', a ], b: [ 'c', b ], c: [ c ] });
tick();
Expand Down

0 comments on commit 8d6090e

Please sign in to comment.