Updating chai references to imports (#70)

This way we can get 'intellisense' for chai
microsoft · Jan 30, 2017 · a4dd198 · a4dd198
1 parent 1b66fab
commit a4dd198
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 110 deletions.
diff --git a/test-integration/clients/teamservicesclient.integration.test.ts b/test-integration/clients/teamservicesclient.integration.test.ts
@@ -4,20 +4,15 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+
 import { Mocks } from "../helpers-integration/mocks";
 import { TestSettings } from "../helpers-integration/testsettings";
 
 import { CredentialManager } from "../../src/helpers/credentialmanager";
 import { TeamServerContext } from "../../src/contexts/servercontext";
 import { TeamServicesApi } from "../../src/clients/teamservicesclient";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("TeamServicesClient-Integration", function() {
     this.timeout(TestSettings.SuiteTimeout()); //http://mochajs.org/#timeouts
 
@@ -108,7 +103,7 @@ describe("TeamServicesClient-Integration", function() {
         try {
             let repositoryClient: TeamServicesApi = new TeamServicesApi(TestSettings.RemoteTfvcRepositoryUrl() + "1", [CredentialManager.GetCredentialHandler()]);
             await repositoryClient.validateTfvcCollectionUrl();
-            assert.Fail(undefined, undefined, "validateTfvcCollectionUrl should have thrown but didn't."); //It shouldn't get here
+            assert.fail(undefined, undefined, "validateTfvcCollectionUrl should have thrown but didn't."); //It shouldn't get here
             done();
         } catch (err) {
             assert.isNotNull(err, "err was null when it shouldn't have been");

diff --git a/test-integration/contexts/servercontext.integration.test.ts b/test-integration/contexts/servercontext.integration.test.ts
@@ -4,19 +4,14 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+
 import { Mocks } from "../helpers-integration/mocks";
 import { TestSettings } from "../helpers-integration/testsettings";
 
 import { CredentialManager } from "../../src/helpers/credentialmanager";
 import { TeamServerContext } from "../../src/contexts/servercontext";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("ServerContext-Integration", function() {
     this.timeout(TestSettings.SuiteTimeout());
 

diff --git a/test-integration/services/build.integration.test.ts b/test-integration/services/build.integration.test.ts
@@ -4,6 +4,8 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+
 import { Mocks } from "../helpers-integration/mocks";
 import { TestSettings } from "../helpers-integration/testsettings";
 
@@ -14,13 +16,6 @@ import { TeamServerContext } from "../../src/contexts/servercontext";
 import { BuildService }  from "../../src/services/build";
 import { WellKnownRepositoryTypes } from "../../src/helpers/constants";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("BuildService-Integration", function() {
     this.timeout(TestSettings.SuiteTimeout());
 

diff --git a/test-integration/services/gitvc.integration.test.ts b/test-integration/services/gitvc.integration.test.ts
@@ -4,6 +4,8 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+
 import { Mocks } from "../helpers-integration/mocks";
 import { TestSettings } from "../helpers-integration/testsettings";
 
@@ -13,13 +15,6 @@ import { CredentialManager } from "../../src/helpers/credentialmanager";
 import { TeamServerContext } from "../../src/contexts/servercontext";
 import { GitVcService, PullRequestScore }  from "../../src/services/gitvc";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("GitVcService-Integration", function() {
     this.timeout(TestSettings.SuiteTimeout());
 

diff --git a/test-integration/services/workitemtracking.integration.test.ts b/test-integration/services/workitemtracking.integration.test.ts
@@ -4,6 +4,8 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+
 import { Mocks } from "../helpers-integration/mocks";
 import { TestSettings } from "../helpers-integration/testsettings";
 
@@ -14,13 +16,6 @@ import { CredentialManager } from "../../src/helpers/credentialmanager";
 import { TeamServerContext } from "../../src/contexts/servercontext";
 import { SimpleWorkItem, WorkItemTrackingService }  from "../../src/services/workitemtracking";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("WorkItemTrackingService-Integration", function() {
     this.timeout(TestSettings.SuiteTimeout());
 

diff --git a/test/contexts/gitcontext.test.ts b/test/contexts/gitcontext.test.ts
@@ -4,17 +4,11 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { GitContext }  from "../../src/contexts/gitcontext";
-
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
+import { assert } from "chai";
 const path = require("path");
 
+import { GitContext }  from "../../src/contexts/gitcontext";
+
 describe("GitContext", function() {
     let TEST_REPOS_FOLDER: string = "testrepos";
     let DOT_GIT_FOLDER: string = "dotgit";

diff --git a/test/contexts/servercontext.test.ts b/test/contexts/servercontext.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { TeamServerContext } from "../../src/contexts/servercontext";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { TeamServerContext } from "../../src/contexts/servercontext";
 
 describe("TeamServerContext", function() {
 

diff --git a/test/helpers/repoutils.test.ts b/test/helpers/repoutils.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { RepoUtils }  from "../../src/helpers/repoutils";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { RepoUtils }  from "../../src/helpers/repoutils";
 
 describe("RepoUtils", function() {
 

diff --git a/test/helpers/utils.test.ts b/test/helpers/utils.test.ts
@@ -4,19 +4,13 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert, expect } from "chai";
+const path = require("path");
+
 import { BuildResult } from "vso-node-api/interfaces/BuildInterfaces";
 import { Utils }  from "../../src/helpers/utils";
 import { Strings }  from "../../src/helpers/strings";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
-const path = require("path");
-
 describe("Utils", function() {
     let TEST_REPOS_FOLDER: string = "testrepos";
     let DOT_GIT_FOLDER: string = "dotgit";

diff --git a/test/info/credentialinfo.test.ts b/test/info/credentialinfo.test.ts
@@ -4,17 +4,12 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert } from "chai";
+
 import { CredentialInfo } from "../../src/info/credentialinfo";
 import { BasicCredentialHandler } from "vso-node-api/handlers/basiccreds";
 import { NtlmCredentialHandler } from "vso-node-api/handlers/ntlm";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("CredentialInfo", function() {
 
     it("should ensure PAT returns a BasicCredentialHandler", function() {

diff --git a/test/info/repositoryinfo.test.ts b/test/info/repositoryinfo.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { RepositoryInfo } from "../../src/info/repositoryinfo";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { RepositoryInfo } from "../../src/info/repositoryinfo";
 
 describe("RepositoryInfo", function() {
 

diff --git a/test/info/userinfo.test.ts b/test/info/userinfo.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { UserInfo } from "../../src/info/userinfo";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { UserInfo } from "../../src/info/userinfo";
 
 describe("UserInfo", function() {
 

diff --git a/test/services/build.test.ts b/test/services/build.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { BuildService }  from "../../src/services/build";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { BuildService }  from "../../src/services/build";
 
 describe("BuildService", function() {
 

diff --git a/test/services/gitvc.test.ts b/test/services/gitvc.test.ts
@@ -4,16 +4,11 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
+import { assert } from "chai";
+
 import { GitPullRequest, PullRequestAsyncStatus } from "vso-node-api/interfaces/GitInterfaces";
 import { GitVcService, PullRequestScore }  from "../../src/services/gitvc";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
-
 describe("GitVcService", function() {
 
     beforeEach(function() {

diff --git a/test/services/workitemtracking.test.ts b/test/services/workitemtracking.test.ts
@@ -4,14 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 "use strict";
 
-import { WorkItemFields, WorkItemTrackingService }  from "../../src/services/workitemtracking";
+import { assert } from "chai";
 
-var chai = require("chai");
-/* tslint:disable:no-unused-variable */
-var expect = chai.expect;
-/* tslint:enable:no-unused-variable */
-var assert = chai.assert;
-chai.should();
+import { WorkItemFields, WorkItemTrackingService }  from "../../src/services/workitemtracking";
 
 describe("WorkItemTrackingService", function() {