Merge 1e0361d into 5a6fe27

jscs-dev · Mar 22, 2016 · 949f255 · 949f255
2 parents 5a6fe27 + 1e0361d
commit 949f255
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 129 deletions.
diff --git a/lib/rules/disallow-empty-blocks.js b/lib/rules/disallow-empty-blocks.js
@@ -93,7 +93,8 @@ module.exports.prototype = {
             if (node.parentElement.type !== 'CatchClause' &&
                 node.parentElement.type !== 'FunctionDeclaration' &&
                 node.parentElement.type !== 'FunctionExpression' &&
-                node.parentElement.type !== 'ArrowFunctionExpression') {
+                node.parentElement.type !== 'ArrowFunctionExpression' &&
+                node.parentElement.type !== 'ObjectMethod') {
                 errors.add('Empty block found', node.lastChild);
             }
         });

diff --git a/lib/rules/validate-quote-marks.js b/lib/rules/validate-quote-marks.js
@@ -116,7 +116,9 @@ module.exports.prototype = {
         file.iterateTokensByType('String', function(token) {
             if (
                 ignoreJSX &&
-                token.parentElement.type === 'StringLiteral' &&
+                // TODO: fix in CST?
+                (token.parentElement.type === 'Literal' ||
+                token.parentElement.type === 'StringLiteral') &&
                 token.parentElement.parentElement.type === 'JSXAttribute'
             ) {
                 return;

diff --git a/lib/visitor-keys.js b/lib/visitor-keys.js
diff --git a/test/specs/rules/disallow-empty-blocks.js b/test/specs/rules/disallow-empty-blocks.js
@@ -141,6 +141,10 @@ describe('rules/disallow-empty-blocks', function() {
         expect(checker.checkString('(a) => {}')).to.have.no.errors();
     });
 
+    it('should not report empty object method', function() {
+        expect(checker.checkString('var a = { b() {} }')).to.have.no.errors();
+    });
+
     describe('allExcept: ["comments"]', function() {
         beforeEach(function() {
             checker = new Checker();

diff --git a/test/specs/rules/disallow-spaces-in-generator.js b/test/specs/rules/disallow-spaces-in-generator.js
@@ -160,6 +160,7 @@ describe('rules/disallow-spaces-in-generator', function() {
             output: 'var x = function*asdf(){}'
         });
 
+        // TODO: fix in CST
         reportAndFix({
             name: 'should report illegal space after the star for the shorthand',
             rules: rules,

diff --git a/test/specs/rules/require-spaces-in-generator.js b/test/specs/rules/require-spaces-in-generator.js
@@ -2,7 +2,7 @@ var Checker = require('../../../lib/checker');
 var expect = require('chai').expect;
 var reportAndFix = require('../../lib/assertHelpers').reportAndFix;
 
-describe('rules/require-spaces-in-generator', function() {
+describe.only('rules/require-spaces-in-generator', function() {
     var checker;
     beforeEach(function() {
         checker = new Checker();
@@ -90,6 +90,7 @@ describe('rules/require-spaces-in-generator', function() {
             output: 'var x = function * asdf(){}'
         });
 
+        // TODO: fix in CST
         reportAndFix({
             name: 'should report missing space after the star for the shorthand',
             rules: rules,

diff --git a/test/specs/string-checker.js b/test/specs/string-checker.js
@@ -376,7 +376,9 @@ describe('string-checker', function() {
         });
     });
 
-    describe.skip('presets', function() {
+    describe('presets', function() {
+        this.timeout(15000);
+
         testPreset('airbnb');
         testPreset('crockford');
         testPreset('google');