"extends" tests now use code inside this project (#1117)

This helps avoid weird dependency bugs that cause builds to fail
palantir · Apr 12, 2016 · cea5d23 · cea5d23
1 parent 4b37269
commit cea5d23
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "grunt-tslint": "latest",
     "mocha": "^2.2.5",
     "tslint": "latest",
-    "tslint-config-typings": "0.1.6",
-    "tslint-config-unional": "0.1.5",
+    "tslint-test-config": "./test/external/tslint-test-config",
+    "tslint-test-custom-rules": "./test/external/tslint-test-custom-rules",
     "typescript": "latest"
   },
   "peerDependencies": {

diff --git a/test/config/tslint-extends-package-array.json b/test/config/tslint-extends-package-array.json
@@ -1,6 +1,6 @@
 {
   "extends": [
-    "tslint-config-unional",
+    "tslint-test-custom-rules",
     "./tslint-custom-rules-with-two-dirs.json"
   ],
   "rules": {

diff --git a/test/config/tslint-extends-package-no-mod.json b/test/config/tslint-extends-package-no-mod.json
@@ -1,3 +1,3 @@
 {
-  "extends": "tslint-config-unional"
+  "extends": "tslint-test-custom-rules"
 }
diff --git a/test/config/tslint-extends-package-two-levels.json b/test/config/tslint-extends-package-two-levels.json
@@ -1,6 +1,6 @@
 {
-  "extends": "tslint-config-typings",
-  "rulesDirectory": "./rules",
+  "extends": "tslint-test-config/tslint.json",
+  "rulesDirectory": "../files/custom-rules",
   "rules": {
     "always-fail": false
   }

diff --git a/test/config/tslint-extends-package.json b/test/config/tslint-extends-package.json
@@ -1,6 +1,7 @@
 {
-  "extends": "tslint-config-unional",
+  "extends": "tslint-test-custom-rules",
   "rules": {
-    "always-fail": false
+    "rule-two": true,
+    "rule-three": false
   }
 }
diff --git a/test/configurationTests.ts b/test/configurationTests.ts
@@ -66,15 +66,21 @@ describe("Configuration", () => {
             let config = loadConfigurationFromPath("./test/config/tslint-extends-package.json");
 
             assert.isArray(config.rulesDirectory);
-            assert.isFalse(config.rules["always-fail"]);
-            assert.isTrue(Object.keys(config.rules).length > 1);
+            assert.deepEqual(config.rules, {
+                "rule-one": true,
+                "rule-two": true,
+                "rule-three": false,
+            });
         });
 
         it("extends with package without customization", () => {
             let config = loadConfigurationFromPath("./test/config/tslint-extends-package-no-mod.json");
 
             assert.isArray(config.rulesDirectory);
-            assert.isTrue(Object.keys(config.rules).length > 1);
+            assert.deepEqual(config.rules, {
+                "rule-one": true,
+                "rule-two": false,
+            });
         });
 
         it("extends with package two levels (and relative path in rulesDirectory)", () => {
@@ -84,17 +90,24 @@ describe("Configuration", () => {
             assert.lengthOf(config.rulesDirectory, 2);
             assert.isTrue(fs.existsSync(config.rulesDirectory[0]));
             assert.isTrue(fs.existsSync(config.rulesDirectory[1]));
-            assert.isFalse(config.rules["always-fail"]);
-            assert.isTrue(Object.keys(config.rules).length > 1);
+            assert.deepEqual(config.rules, {
+                "always-fail": false,
+                "rule-one": true,
+                "rule-two": true,
+                "rule-four": true,
+            });
         });
 
         it("extends with array", () => {
             let config = loadConfigurationFromPath("./test/config/tslint-extends-package-array.json");
 
             assert.isArray(config.rulesDirectory);
-            assert.isTrue(config.rules["no-fail"]);
-            assert.isFalse(config.rules["always-fail"]);
-            assert.isTrue(Object.keys(config.rules).length > 1);
+            assert.deepEqual(config.rules, {
+                "always-fail": false,
+                "no-fail": true,
+                "rule-one": true,
+                "rule-two": false,
+            });
         });
     });
 });
diff --git a/test/config/rules/dummyRule.js → test/external/tslint-test-config/index.js b/test/config/rules/dummyRule.js → test/external/tslint-test-config/index.js
diff --git a/test/external/tslint-test-config/package.json b/test/external/tslint-test-config/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "tslint-test-config",
+  "version": "0.0.1",
+  "main": "index.js",
+  "scripts": {}
+}
diff --git a/test/external/tslint-test-config/tslint.json b/test/external/tslint-test-config/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "tslint-test-custom-rules",
+    "rules": {
+        "rule-two": true,
+        "rule-four": true
+    }
+}
diff --git a/test/external/tslint-test-custom-rules/package.json b/test/external/tslint-test-custom-rules/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "tslint-test-custom-rules",
+  "version": "0.0.1",
+  "main": "tslint.json",
+  "scripts": {}
+}
diff --git a/test/external/tslint-test-custom-rules/rules/ruleOneRule.js b/test/external/tslint-test-custom-rules/rules/ruleOneRule.js
diff --git a/test/external/tslint-test-custom-rules/rules/ruleThreeRule.js b/test/external/tslint-test-custom-rules/rules/ruleThreeRule.js
diff --git a/test/external/tslint-test-custom-rules/rules/ruleTwoRule.js b/test/external/tslint-test-custom-rules/rules/ruleTwoRule.js
diff --git a/test/external/tslint-test-custom-rules/tslint.json b/test/external/tslint-test-custom-rules/tslint.json
@@ -0,0 +1,7 @@
+{
+    "rulesDirectory": ["./rules"],
+    "rules": {
+        "rule-one": true,
+        "rule-two": false
+    }
+}