Misc: update jscs and fix tests

jscs-dev · Sep 6, 2015 · 8ba3eaf · 8ba3eaf
1 parent 43bfdeb
commit 8ba3eaf
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -2,5 +2,6 @@
  * @param {module:jscs/lib/Configuration} configuration
  */
 module.exports = function(configuration) {
+    delete configuration._rules.jsDoc;
     configuration.registerRule(require('./rules/validate-jsdoc'));
 };
diff --git a/package.json b/package.json
@@ -28,7 +28,8 @@
   },
   "devDependencies": {
     "chai": "^2.3.0",
-    "jscs": "^1.13.1",
+    "chai-subset": "^1.1.0",
+    "jscs": "^2.1.1",
     "jshint": "^2.7.0",
     "mocha": "^2.2.4"
   },

diff --git a/test/init.js b/test/init.js
@@ -3,6 +3,8 @@ var parse = require('comment-parser');
 var chai = require('chai');
 var expect = chai.expect;
 
+chai.use(require('chai-subset'));
+
 global.parse = parse;
 global.fnBody = fnBody;
 global.checker = rulesChecker;
@@ -110,7 +112,7 @@ function rulesChecker(opts) {
                             .to.eq(test.errors || 0);
                     } else if (Array.isArray(test.errors)) {
                         expect(errors)
-                            .to.deep.equal(test.errors);
+                            .to.containSubset(test.errors);
                     } else {
                         expect(checked.getErrorCount())
                             .to.not.eq(0);

diff --git a/test/lib/rules/validate-jsdoc/check-annotations.js b/test/lib/rules/validate-jsdoc/check-annotations.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/check-annotations', function() {
     var checker = global.checker({
-        additionalRules: ['lib/rules/validate-jsdoc.js']
+        plugins: ['.']
     });
 
     describe('with true', function() {

diff --git a/test/lib/rules/validate-jsdoc/check-redundant-params.js b/test/lib/rules/validate-jsdoc/check-redundant-params.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/check-redundant-params', function () {
     var checker = global.checker({
-        plugins: ['./lib/index']
+        plugins: ['.']
     });
 
     describe('not configured', function() {

diff --git a/test/lib/rules/validate-jsdoc/disallow-newline-after-description.js b/test/lib/rules/validate-jsdoc/disallow-newline-after-description.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/disallow-newline-after-description', function () {
     var checker = global.checker({
-        additionalRules: ['lib/rules/validate-jsdoc.js']
+        plugins: ['.']
     });
 
     describe('not configured', function() {

diff --git a/test/lib/rules/validate-jsdoc/require-description-complete-sentence.js b/test/lib/rules/validate-jsdoc/require-description-complete-sentence.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/require-description-complete-sentence', function () {
     var checker = global.checker({
-        additionalRules: ['lib/rules/validate-jsdoc.js']
+        plugins: ['.']
     });
 
     describe('not configured', function() {

diff --git a/test/lib/rules/validate-jsdoc/require-hyphen-before-description.js b/test/lib/rules/validate-jsdoc/require-hyphen-before-description.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/require-hyphen-before-description', function () {
     var checker = global.checker({
-        additionalRules: ['lib/rules/validate-jsdoc.js']
+        plugins: ['.']
     });
 
     describe('not configured', function() {

diff --git a/test/lib/rules/validate-jsdoc/require-newline-after-description.js b/test/lib/rules/validate-jsdoc/require-newline-after-description.js
@@ -1,6 +1,6 @@
 describe('lib/rules/validate-jsdoc/require-newline-after-description', function () {
     var checker = global.checker({
-        additionalRules: ['lib/rules/validate-jsdoc.js']
+        plugins: ['.']
     });
 
     describe('not configured', function() {