Merge pull request #122 from codeclimate/pr/109

Code cleanup
codeclimate · Aug 17, 2016 · a508779 · a508779
2 parents 40884b0 + 893db11
commit a508779
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,8 +1,10 @@
 {
   "env": {
-    "node": true
+    "node": true,
+    "mocha": true
   },
   "rules": {
+    "block-spacing": 2,
     "brace-style": [2, "1tbs", { "allowSingleLine": true }],
     "comma-dangle": [2, "never"],
     "comma-style": [2, "first", { exceptions: {ArrayExpression: true, ObjectExpression: true} }],

diff --git a/bin/eslint.js b/bin/eslint.js
@@ -44,6 +44,8 @@ function buildIssueJson(message, path) {
   if(message.fatal) {
     checkName = "fatal";
   }
+  var line = message.line || 1;
+  var column = message.column || 1;
 
   var issue = {
     type: "issue",
@@ -57,12 +59,12 @@ function buildIssueJson(message, path) {
       path: path,
       positions: {
         begin: {
-          line: message.line || 1,
-          column: message.column || 1
+          line: line,
+          column: column
         },
         end: {
-          line: message.line || 1,
-          column: message.column || 1
+          line: line,
+          column: column
         }
       }
     },

diff --git a/test/checks_test.js b/test/checks_test.js
@@ -13,6 +13,9 @@ describe("checks module", function() {
   });
 
   describe(".remediationPoints()", function() {
+    var eslintConfig = function(rulesConfig) {
+      return { rules: rulesConfig };
+    };
     it("returns the default of 50,000 for a non-complexity issue", function() {
       var issue = { ruleId: "eqeqeq", message: "always use ==="};
       expect(checks.remediationPoints(issue.ruleId, issue, null)).to.eq(50000);
@@ -41,9 +44,5 @@ describe("checks module", function() {
         , config = eslintConfig({ "complexity": [2, 10] });
       expect(checks.remediationPoints(issue.ruleId, issue, config)).to.eq(1000000);
     });
-
-    var eslintConfig = function(rulesConfig) {
-      return { rules: rulesConfig };
-    };
   });
 });
diff --git a/test/validate_config_test.js b/test/validate_config_test.js
@@ -13,7 +13,7 @@ describe("validateConfig", function() {
 
   it("returns false if no files exist", function(done) {
     temp.mkdir("no-config", function(err, directory) {
-      if (err) throw err;
+      if (err) { throw err; }
 
       process.chdir(directory);
 
@@ -24,7 +24,7 @@ describe("validateConfig", function() {
 
   it("returns true if an eslintrc exists", function(done) {
     temp.mkdir("config", function(err, directory) {
-      if (err) throw err;
+      if (err) { throw err; }
 
       process.chdir(directory);
 
@@ -36,7 +36,7 @@ describe("validateConfig", function() {
       };
 
       fs.writeFile(configPath, JSON.stringify(config), function(err) {
-        if (err) throw err;
+        if (err) { throw err; }
 
         expect(validateConfig(null)).to.eq(true);
         done();