mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-09 11:13:57 +08:00
Merge pull request #4109 from a3chic9/a3chic9-jasmine
Added optional string parameter for pending function
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/// <reference path="jasmine.d.ts" />
|
||||
|
||||
// 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');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Vendored
+2
-2
@@ -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 <https://github.com/borisyankov/>, Theodore Brown <https://github.com/theodorejb>, David Pärsson <https://github.com/davidparsson/>
|
||||
// Definitions: https://github.com/borisyankov/DefinitelyTyped
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user