From 19a23c4d38229847963eda0ecf0899a9bdb655aa Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Tue, 14 Apr 2015 10:27:31 -0400 Subject: [PATCH 1/3] Update jasmine pending() definition Added option string parameter --- jasmine/jasmine.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jasmine/jasmine.d.ts b/jasmine/jasmine.d.ts index 3727f8839..565b472f9 100644 --- a/jasmine/jasmine.d.ts +++ b/jasmine/jasmine.d.ts @@ -18,7 +18,7 @@ declare function xit(expectation: string, assertion?: () => void, timeout?: numb declare function xit(expectation: string, assertion?: (done: () => void) => void, timeout?: number): void; /** If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending. */ -declare function pending(): void; +declare function pending(reason?: string): void; declare function beforeEach(action: () => void, timeout?: number): void; declare function beforeEach(action: (done: () => void) => void, timeout?: number): void; From efffa6ec97e2e63a824c57a2f80402486e756771 Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Tue, 14 Apr 2015 10:39:16 -0400 Subject: [PATCH 2/3] Added pending tests --- jasmine/jasmine-tests.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jasmine/jasmine-tests.ts b/jasmine/jasmine-tests.ts index ef0572303..8e3365eaf 100644 --- a/jasmine/jasmine-tests.ts +++ b/jasmine/jasmine-tests.ts @@ -1,6 +1,6 @@ /// -// tests based on http://jasmine.github.io/2.0/introduction.html +// tests based on http://jasmine.github.io/2.2/introduction.html describe("A suite", function () { it("contains spec with an expectation", function () { @@ -248,7 +248,8 @@ describe("Pending specs", function () { it("can be declared by calling 'pending' in the spec body", function () { expect(true).toBe(false); - pending(); + pending(); // without reason + pending('this is why it is pending'); }); }); From 1142e2b664b645f054d7f51060dc7b398fd0de25 Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Tue, 14 Apr 2015 10:52:32 -0400 Subject: [PATCH 3/3] Update Jasmine version to 2.2 --- jasmine/jasmine.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jasmine/jasmine.d.ts b/jasmine/jasmine.d.ts index 565b472f9..64936f442 100644 --- a/jasmine/jasmine.d.ts +++ b/jasmine/jasmine.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Jasmine 2.1 +// Type definitions for Jasmine 2.2 // Project: http://jasmine.github.io/ // Definitions by: Boris Yankov , Theodore Brown , David Pärsson // Definitions: https://github.com/borisyankov/DefinitelyTyped