Chore: Reorganizing tests to align with project structure (#46)

eslint · Sep 27, 2016 · c19cd6d · c19cd6d
1 parent 0b540e2
commit c19cd6d
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 109 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   ],
   "repository": "eslint/generator-eslint",
   "scripts": {
-    "test": "npm run lint && mocha",
+    "test": "npm run lint && mocha \"tests/**/*.js\"",
     "lint": "eslint .",
     "release": "eslint-release",
     "ci-release": "eslint-ci-release",

diff --git a/test/.eslintrc.yml → tests/.eslintrc.yml b/test/.eslintrc.yml → tests/.eslintrc.yml
diff --git a/test/test-main.js → tests/app/index.js b/test/test-main.js → tests/app/index.js
@@ -29,7 +29,7 @@ describe("ESLint Main Generator", function() {
             exec: this.spy
         });
 
-        helpers.testDirectory(path.join(__dirname, "temp"), done);
+        helpers.testDirectory(path.join(__dirname, "../../temp"), done);
     });
 
     beforeEach(function() {
@@ -50,7 +50,7 @@ describe("ESLint Main Generator", function() {
              */
 
             this.eslintGenerator = helpers.createGenerator("eslint", [
-                "../../app",
+                "../app",
                 [this.dummyGenerator, "eslint:plugin"]
             ]);
 
@@ -82,7 +82,7 @@ describe("ESLint Main Generator", function() {
              */
 
             this.eslintGenerator = helpers.createGenerator("eslint", [
-                "../../app",
+                "../app",
                 [this.dummyGenerator, "eslint:rule"]
             ]);
 

diff --git a/test/test-validation.js → tests/lib/validators.js b/test/test-validation.js → tests/lib/validators.js
@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 var assert = require("assert");
-var validators = require("../lib/validators");
+var validators = require("../../lib/validators");
 
 //------------------------------------------------------------------------------
 // Tests

diff --git a/test/test-creation.js → tests/plugin/index.js b/test/test-creation.js → tests/plugin/index.js
@@ -1,5 +1,5 @@
 /**
- * @fileoverview Rule generator tests
+ * @fileoverview Plugin generator tests
  * @author Nicholas C. Zakas
  */
 
@@ -11,121 +11,25 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var fs = require("fs"),
-    path = require("path"),
+var path = require("path"),
     helpers = require("yeoman-test"),
     assert = require("yeoman-assert");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var testDirectory = path.join(__dirname, "temp");
-
-describe("ESLint Rule Generator", function() {
-    beforeEach(function(done) {
-        helpers.testDirectory(testDirectory, function(err) {
-            if (err) {
-                return done(err);
-            }
-
-            this.rule = helpers.createGenerator("eslint:rule", [
-                "../../rule"
-            ]);
-            return done();
-        }.bind(this));
-    });
-
-    it("creates expected files", function(done) {
-
-        var expected = [
-            "docs/rules/foo-bar.md",
-            "lib/rules/foo-bar.js",
-            "tests/lib/rules/foo-bar.js"
-        ];
-
-        helpers.mockPrompt(this.rule, {
-            userName: "Foo Bar",
-            ruleId: "foo-bar",
-            desc: "My foo",
-            invalidCode: "var x;",
-            target: "eslint"
-        });
-        this.rule.options["skip-install"] = true;
-        this.rule.run(function() {
-            assert.file(expected);
-            done();
-        });
-    });
-
-    describe("With pathological input", function() {
-        describe("Double quotes in description", function() {
-            beforeEach(function(done) {
-                helpers.mockPrompt(this.rule, {
-                    userName: "",
-                    ruleId: "test-rule",
-                    desc: "My \"foo\"",
-                    invalidCode: "var x = \"foo\";",
-                    target: "eslint"
-                });
-                this.rule.options["skip-install"] = true;
-                this.rule.run(done);
-            });
-
-            describe("Resulting rule file", function() {
-                beforeEach(function() {
-                    this.resultRuleModule = require(path.join(testDirectory, "lib", "rules", "test-rule"));
-                });
-
-                it("should be requireable", function() {
-                    assert.ok(this.resultRuleModule);
-                });
-
-                it("should have correct description", function() {
-                    assert.strictEqual(this.resultRuleModule.meta.docs.description, "My \"foo\"");
-                });
-            });
-        });
-
-        describe("Double quotes in code snippet", function() {
-            beforeEach(function(done) {
-                helpers.mockPrompt(this.rule, {
-                    userName: "",
-                    ruleId: "test-rule",
-                    desc: "My \"foo\"",
-                    invalidCode: "var x = \"foo\";",
-                    target: "eslint"
-                });
-                this.rule.options["skip-install"] = true;
-                this.rule.run(done);
-            });
-
-            describe("Resulting test file", function() {
-                beforeEach(function() {
-                    this.resultTestModuleContent = fs.readFileSync(path.join(testDirectory, "tests", "lib", "rules", "test-rule.js"), "utf8");
-                });
-
-                it("should be readable", function() {
-                    assert.ok(this.resultTestModuleContent);
-                });
-
-                it("should have correct code snippet", function() {
-                    assert.ok(this.resultTestModuleContent.indexOf("code: \"var x = \\\"foo\\\";") > -1);
-                });
-            });
-        });
-    });
-});
+var testDirectory = path.join(__dirname, "../../temp");
 
 describe("ESLint Plugin Generator", function() {
     beforeEach(function(done) {
-        helpers.testDirectory(path.join(__dirname, "temp"), function(err) {
+        helpers.testDirectory(testDirectory, function(err) {
             if (err) {
                 return done(err);
             }
 
             this.rule = helpers.createGenerator("eslint:plugin", [
-                "../../plugin"
+                "../plugin"
             ]);
             return done();
         }.bind(this));

diff --git a/tests/rule/index.js b/tests/rule/index.js
@@ -0,0 +1,118 @@
+/**
+ * @fileoverview Rule generator tests
+ * @author Nicholas C. Zakas
+ */
+
+/* eslint no-invalid-this:0 */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+var fs = require("fs"),
+    path = require("path"),
+    helpers = require("yeoman-test"),
+    assert = require("yeoman-assert");
+
+//------------------------------------------------------------------------------
+// Tests
+//------------------------------------------------------------------------------
+
+var testDirectory = path.join(__dirname, "../../temp");
+
+describe("ESLint Rule Generator", function() {
+    beforeEach(function(done) {
+        helpers.testDirectory(testDirectory, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            this.rule = helpers.createGenerator("eslint:rule", [
+                "../rule"
+            ]);
+            return done();
+        }.bind(this));
+    });
+
+    it("creates expected files", function(done) {
+
+        var expected = [
+            "docs/rules/foo-bar.md",
+            "lib/rules/foo-bar.js",
+            "tests/lib/rules/foo-bar.js"
+        ];
+
+        helpers.mockPrompt(this.rule, {
+            userName: "Foo Bar",
+            ruleId: "foo-bar",
+            desc: "My foo",
+            invalidCode: "var x;",
+            target: "eslint"
+        });
+        this.rule.options["skip-install"] = true;
+        this.rule.run(function() {
+            assert.file(expected);
+            done();
+        });
+    });
+
+    describe("With pathological input", function() {
+        describe("Double quotes in description", function() {
+            beforeEach(function(done) {
+                helpers.mockPrompt(this.rule, {
+                    userName: "",
+                    ruleId: "test-rule",
+                    desc: "My \"foo\"",
+                    invalidCode: "var x = \"foo\";",
+                    target: "eslint"
+                });
+                this.rule.options["skip-install"] = true;
+                this.rule.run(done);
+            });
+
+            describe("Resulting rule file", function() {
+                beforeEach(function() {
+                    this.resultRuleModule = require(path.join(testDirectory, "lib", "rules", "test-rule"));
+                });
+
+                it("should be requireable", function() {
+                    assert.ok(this.resultRuleModule);
+                });
+
+                it("should have correct description", function() {
+                    assert.strictEqual(this.resultRuleModule.meta.docs.description, "My \"foo\"");
+                });
+            });
+        });
+
+        describe("Double quotes in code snippet", function() {
+            beforeEach(function(done) {
+                helpers.mockPrompt(this.rule, {
+                    userName: "",
+                    ruleId: "test-rule",
+                    desc: "My \"foo\"",
+                    invalidCode: "var x = \"foo\";",
+                    target: "eslint"
+                });
+                this.rule.options["skip-install"] = true;
+                this.rule.run(done);
+            });
+
+            describe("Resulting test file", function() {
+                beforeEach(function() {
+                    this.resultTestModuleContent = fs.readFileSync(path.join(testDirectory, "tests", "lib", "rules", "test-rule.js"), "utf8");
+                });
+
+                it("should be readable", function() {
+                    assert.ok(this.resultTestModuleContent);
+                });
+
+                it("should have correct code snippet", function() {
+                    assert.ok(this.resultTestModuleContent.indexOf("code: \"var x = \\\"foo\\\";") > -1);
+                });
+            });
+        });
+    });
+});
diff --git a/test/test-load.js → tests/test-load.js b/test/test-load.js → tests/test-load.js
@@ -3,15 +3,13 @@
  * @author Nicholas C. Zakas
  */
 
-/* eslint no-undefined:0 */
-
 "use strict";
 
 var assert = require("assert");
 
 describe("eslint generator", function() {
     it("can be imported without blowing up", function() {
         var app = require("../rule");
-        assert(app !== undefined);
+        assert.ok(app);
     });
 });