From 18628d14904e2bc1b32579f857620d4914d69f51 Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 16:03:05 +0100 Subject: [PATCH] fix chai, chai-jquery and sinon-chai for TS 0.9 --- chai-jquery/chai-jquery-tests.ts | 4 ++-- chai/{chai-assert-test.ts => chai-assert-tests.ts} | 4 ++-- chai/chai-tests.ts | 1 - chai/chai.d.ts | 6 +----- sinon-chai/sinon-chai-tests.ts | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) rename chai/{chai-assert-test.ts => chai-assert-tests.ts} (99%) diff --git a/chai-jquery/chai-jquery-tests.ts b/chai-jquery/chai-jquery-tests.ts index fbd05480e..97ed7a36a 100644 --- a/chai-jquery/chai-jquery-tests.ts +++ b/chai-jquery/chai-jquery-tests.ts @@ -1,5 +1,5 @@ -///  -///  +/// +/// declare var $; var expect = chai.expect; diff --git a/chai/chai-assert-test.ts b/chai/chai-assert-tests.ts similarity index 99% rename from chai/chai-assert-test.ts rename to chai/chai-assert-tests.ts index b4a5a15be..19429b4c9 100644 --- a/chai/chai-assert-test.ts +++ b/chai/chai-assert-tests.ts @@ -330,7 +330,7 @@ suite('assert', function () { test('isArray', function () { assert.isArray([]); - assert.isArray(new Array); + assert.isArray(new Array()); err(function () { assert.isArray({}); @@ -345,7 +345,7 @@ suite('assert', function () { }, "expected [] not to be an array"); err(function () { - assert.isNotArray(new Array); + assert.isNotArray(new Array()); }, "expected [] not to be an array"); }); diff --git a/chai/chai-tests.ts b/chai/chai-tests.ts index 3774e3895..ab26aadbc 100644 --- a/chai/chai-tests.ts +++ b/chai/chai-tests.ts @@ -1,6 +1,5 @@ /// -var chai: chai; var expect = chai.expect; function test_be() { diff --git a/chai/chai.d.ts b/chai/chai.d.ts index f74673727..6a9010322 100644 --- a/chai/chai.d.ts +++ b/chai/chai.d.ts @@ -116,10 +116,6 @@ declare module chai { to: To; } + function expect(target: any): chai.ExpectMatchers; } -interface chai { - expect: { - (target: any): chai.ExpectMatchers; - } -} diff --git a/sinon-chai/sinon-chai-tests.ts b/sinon-chai/sinon-chai-tests.ts index 1ada034de..e4de0f5a4 100644 --- a/sinon-chai/sinon-chai-tests.ts +++ b/sinon-chai/sinon-chai-tests.ts @@ -1,5 +1,5 @@ -///  -///  +/// +/// var expect = chai.expect;