Make mocha run all tests, fix broken tests (palantir#1677)

package.json

@@ -30,7 +30,7 @@
     "lint:test": "tslint test/**/*.ts -e test/**/*.test.ts",
     "test": "npm-run-all test:pre -p test:mocha test:rules",
     "test:pre": "cd ./test/config && npm install",
-    "test:mocha": "mocha --reporter spec --colors build/test/**/*Tests.js build/test/assert.js",
+    "test:mocha": "mocha --reporter spec --colors \"build/test/**/*Tests.js\" build/test/assert.js",
     "test:rules": "node ./build/test/ruleTestRunner.js",
     "verify": "npm-run-all clean compile lint test docs"
   },

src/ruleLoader.ts

@@ -46,7 +46,7 @@ export function loadRules(ruleConfiguration: {[name: string]: any},
             if (Rule == null) {
                 notFoundRules.push(ruleName);
             } else {
-                if (isJs && Rule.metadata.typescriptOnly != null && Rule.metadata.typescriptOnly) {
+                if (isJs && Rule.metadata && Rule.metadata.typescriptOnly != null && Rule.metadata.typescriptOnly) {
                     notAllowedInJsRules.push(ruleName);
                 } else {
                     const all = "all"; // make the linter happy until we can turn it on and off

src/tslintMulti.ts

@@ -101,7 +101,7 @@ class MultiLinter {
         }
 
         if (sourceFile === undefined) {
-            throw new Error(`Invalid source file: ${fileName}. Ensure that the files supplied to lint have a .ts or .tsx extension.`);
+            throw new Error(`Invalid source file: ${fileName}. Ensure that the files supplied to lint have a .ts, .tsx, or .js extension.`);
         }
 
         // walk the code first to find all the intervals where rules are disabled

test/config/tslint-almost-empty.json

@@ -1 +1 @@
-{ "rules": {} }
+{ "jsRules": {}, "rules": {} }

test/config/tslint-custom-rules-with-dir.json

@@ -1,5 +1,8 @@
 {
   "rulesDirectory": "../files/custom-rules/",
+  "jsRules": {
+    "always-fail": true
+  },
   "rules": {
     "always-fail": true
   }

test/config/tslint-custom-rules-with-two-dirs.json

@@ -1,5 +1,9 @@
 {
   "rulesDirectory": ["../files/custom-rules-2", "../files/custom-rules/"],
+  "jsRules": {
+    "always-fail": true,
+    "no-fail": true
+  },
   "rules": {
     "always-fail": true,
     "no-fail": true

test/config/tslint-custom-rules.json

@@ -1,4 +1,7 @@
 {
+  "jsRules": {
+    "always-fail": true
+  },
   "rules": {
     "always-fail": true
   }

test/config/tslint-with-bom.json

@@ -1 +1 @@
-{ "rules": { } }
+{ "jsRules": { },  "rules": { } }

test/config/tslint-with-comments.json

@@ -1,4 +1,13 @@
 {
+  // a nice comment
+  "jsRules": {
+      /*
+      "rule-one": true,
+      */
+      "rule-two": true,
+      "rule-three": "//not a comment",
+      "rule-four": "/*also not a comment*/"
+  },
   // a nice comment
   "rules": {
       /*

test/configurationTests.ts

@@ -113,7 +113,7 @@ describe("Configuration", () => {
 
         it("extends with builtin", () => {
             const config = loadConfigurationFromPath("./test/config/tslint-extends-builtin.json");
-            assert.isTrue(config.jsRules["no-var-keyword"]);
+            assert.isUndefined(config.jsRules["no-var-keyword"]);
             assert.isFalse(config.jsRules["no-eval"]);
             assert.isTrue(config.rules["no-var-keyword"]);
             assert.isFalse(config.rules["no-eval"]);
@@ -144,9 +144,6 @@ describe("Configuration", () => {
             it("extends with package installed relative to tslint", () => {
                 fs.writeFileSync(tmpfile, JSON.stringify({ extends: "tslint-test-config-non-relative" }));
                 let config = loadConfigurationFromPath(tmpfile);
-                assert.deepEqual(config.jsRules, {
-                    "class-name": true,
-                });
                 assert.deepEqual(config.rules, {
                     "class-name": true,
                 });

test/executable/executableTests.ts

@@ -24,8 +24,9 @@ const EXECUTABLE_DIR = path.resolve(process.cwd(), "test", "executable");
 const EXECUTABLE_PATH = path.resolve(EXECUTABLE_DIR, "npm-like-executable");
 const TEMP_JSON_PATH = path.resolve(EXECUTABLE_DIR, "tslint.json");
 
-describe("Executable", () => {
-
+/* tslint:disable:only-arrow-functions */
+describe("Executable", function() {
+    this.slow(3000);    // the executable is JIT-ed each time it runs; avoid showing slowness warnings
     describe("Files", () => {
         it("exits with code 1 if no arguments passed", (done) => {
             execCli([], (err, stdout, stderr) => {

test/external/tslint-test-config-non-relative/tslint.json

@@ -1,4 +1,7 @@
 {
+  "jsRules": {
+    "class-name": true
+  },
   "rules": {
     "class-name": true
   }

test/external/tslint-test-config/tslint.json

@@ -1,5 +1,9 @@
 {
     "extends": "tslint-test-custom-rules",
+    "jsRules": {
+        "rule-two": true,
+        "rule-four": true
+    },
     "rules": {
         "rule-two": true,
         "rule-four": true

test/external/tslint-test-custom-rules/tslint.json

@@ -1,5 +1,9 @@
 {
     "rulesDirectory": ["./rules"],
+    "jsRules": {
+        "rule-one": true,
+        "rule-two": false
+    },
     "rules": {
         "rule-one": true,
         "rule-two": false