Upgrade to ESLint 1.0 (fixes #41)

ilyavolodin · Aug 29, 2015 · 77dd720 · 77dd720
1 parent f1ea710
commit 77dd720
Show file tree

Hide file tree

Showing 36 changed files with 154 additions and 98 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,4 +1,5 @@
 {
+ "extends": "eslint:recommended",
  "env": {
  "node": true
  },
@@ -19,6 +20,7 @@
  "return": "returns"
  }
  }],
- "wrap-iife": 2
+ "wrap-iife": 2,
+ "semi": 2
  }
 }
diff --git a/lib/rules/collection-model.js b/lib/rules/collection-model.js
@@ -43,3 +43,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/defaults-on-top.js b/lib/rules/defaults-on-top.js
@@ -28,5 +28,6 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/event-scope.js b/lib/rules/event-scope.js
@@ -44,5 +44,6 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/events-on-top.js b/lib/rules/events-on-top.js
@@ -43,3 +43,14 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [
+ {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "uniqueItems": true
+ },
+ "additionalProperties": false
+ }
+];
diff --git a/lib/rules/initialize-on-top.js b/lib/rules/initialize-on-top.js
@@ -56,3 +56,23 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [
+ {
+ "type": "object",
+ "properties": {
+ "View": {
+ "type": "array",
+ "value": "string"
+ },
+ "Model": {
+ "type": "array",
+ "value": "string"
+ },
+ "Collection": {
+ "type": "array",
+ "value": "string"
+ }
+ }
+ }
+];
diff --git a/lib/rules/model-defaults.js b/lib/rules/model-defaults.js
@@ -43,3 +43,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-changed-set.js b/lib/rules/no-changed-set.js
@@ -40,3 +40,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-collection-models.js b/lib/rules/no-collection-models.js
@@ -37,3 +37,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-constructor.js b/lib/rules/no-constructor.js
@@ -28,3 +28,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-el-assign.js b/lib/rules/no-el-assign.js
@@ -37,5 +37,6 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-model-attributes.js b/lib/rules/no-model-attributes.js
@@ -37,3 +37,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-native-jquery.js b/lib/rules/no-native-jquery.js
@@ -48,5 +48,10 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [
+ {
+ "enum": ["all", "selector"]
+ }
+];
diff --git a/lib/rules/no-silent.js b/lib/rules/no-silent.js
@@ -41,5 +41,6 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-view-collection-models.js b/lib/rules/no-view-collection-models.js
@@ -39,3 +39,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-view-model-attributes.js b/lib/rules/no-view-model-attributes.js
@@ -39,3 +39,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/no-view-onoff-binding.js b/lib/rules/no-view-onoff-binding.js
@@ -43,3 +43,5 @@ module.exports = function(context) {
  }
  };
 };
+
+module.exports.schema = [];
diff --git a/lib/rules/render-return.js b/lib/rules/render-return.js
@@ -43,5 +43,6 @@ module.exports = function(context) {
  }
  }
  };
-
 };
+
+module.exports.schema = [];
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint-plugin-backbone",
- "version": "1.0.2",
+ "version": "1.0.3",
  "description": "Eslint rules for Backbone.",
  "main": "index.js",
  "scripts": {
@@ -13,11 +13,7 @@
  "devDependencies": {
  "istanbul": "0.3.0",
  "mocha": "1.21.4",
- "eslint-tester": "^0.8.0",
- "eslint": ">=0.24.0"
- },
- "peerDependencies": {
- "eslint": ">=0.8.1"
+ "eslint": ">=1.0.0"
  },
  "repository": {
  "type": "git",
@@ -36,4 +32,3 @@
  "eslint"
  ]
 }
-
diff --git a/tests/lib/rules/collection-model.js b/tests/lib/rules/collection-model.js
@@ -8,15 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/collection-model");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/collection-model", {
+var eslintTester = new RuleTester();
+eslintTester.run("collection-model", rule, {
 
  valid: [
  "Backbone.Collection.extend({ model: {}});",

diff --git a/tests/lib/rules/defaults-on-top.js b/tests/lib/rules/defaults-on-top.js
@@ -8,15 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/defaults-on-top");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/defaults-on-top", {
+var eslintTester = new RuleTester();
+eslintTester.run("defaults-on-top", rule, {
 
  valid: [
  "Backbone.Model.extend({ defaults: {}, initialize: function() {} });",

diff --git a/tests/lib/rules/event-scope.js b/tests/lib/rules/event-scope.js
@@ -8,15 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/event-scope");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/event-scope", {
+var eslintTester = new RuleTester();
+eslintTester.run("event-scope", rule, {
 
  valid: [
  "Backbone.Collection.extend({});",

diff --git a/tests/lib/rules/events-on-top.js b/tests/lib/rules/events-on-top.js
@@ -8,22 +8,22 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/events-on-top");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/events-on-top", {
+var eslintTester = new RuleTester();
+eslintTester.run("events-on-top", rule, {
 
  valid: [
  "Backbone.View.extend({ events: {}, initialize: function() {} });",
  "Backbone.View.extend({ });",
  "Backbone.View.extend({ initialize: function() {} });",
  "Backbone.View.extend({ initialize: function() { var events = {}; } });",
- { code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {} });", args: [1, ["tagName", "className"]] }
+ { code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {} });", options: [["tagName", "className"]] }
  ],
 
  invalid: [
@@ -32,15 +32,15 @@ eslintTester.addRuleTest("lib/rules/events-on-top", {
  errors: [ { message: "events should be declared at the top of the view." } ]
  },
  {
- code: "Backbone.View.extend({ initialize: function() {}, tagName: 'div', 'className': 'test', events: {} });", args: [1, ["tagName", "className"]],
+ code: "Backbone.View.extend({ initialize: function() {}, tagName: 'div', 'className': 'test', events: {} });", options: [["tagName", "className"]],
  errors: [ { message: "events should be declared at the top of the view." } ]
  },
  {
- code: "Backbone.View.extend({ tagName: 'div', initialize: function() {}, 'className': 'test', events: {} });", args: [1, ["tagName", "className"]],
+ code: "Backbone.View.extend({ tagName: 'div', initialize: function() {}, 'className': 'test', events: {} });", options: [["tagName", "className"]],
  errors: [ { message: "events should be declared at the top of the view." } ]
  },
  {
- code: "Backbone.View.extend({ render: function() {}, initialize: function() {}, 'className': 'test', events: {} });", args: [1, ["tagName", "className"]],
+ code: "Backbone.View.extend({ render: function() {}, initialize: function() {}, 'className': 'test', events: {} });", options: [["tagName", "className"]],
  errors: [ { message: "events should be declared at the top of the view." } ]
  }
  ]

diff --git a/tests/lib/rules/initialize-on-top.js b/tests/lib/rules/initialize-on-top.js
@@ -8,15 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/initialize-on-top");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/initialize-on-top", {
+var eslintTester = new RuleTester();
+eslintTester.run("initialize-on-top", rule, {
 
  valid: [
  "Backbone.View.extend({ initialize: function() {} });",
@@ -26,38 +26,38 @@ eslintTester.addRuleTest("lib/rules/initialize-on-top", {
  "Backbone.Collection.extend({ initialize: function() {} });",
  "Backbone.Collection.extend({ });",
  "Backbone.View.extend({ render: function() {} });",
- { code: "Backbone.Model.extend({ defaults: {}, initialize: function() {} });", args: [1, { Model: ["defaults"] }] },
- { code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", args: [1, { View: ["tagName", "className", "events"] }] },
- { code: "Backbone.Collection.extend({ model: {}, initialize: function() {} });", args: [1, { Collection: ["model"] }] }
+ { code: "Backbone.Model.extend({ defaults: {}, initialize: function() {} });", options: [{ Model: ["defaults"] }] },
+ { code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", options: [{ View: ["tagName", "className", "events"] }] },
+ { code: "Backbone.Collection.extend({ model: {}, initialize: function() {} });", options: [{ Collection: ["model"] }] }
  ],
 
  invalid: [
  {
- code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", args: [1, { View: ["className", "events"] }],
+ code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", options: [{ View: ["className", "events"] }],
  errors: [ { message: "Initialize should be declared at the top of the view." } ]
  },
  {
- code: "Backbone.Collection.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", args: [1, { View: ["className", "events"], Collection: ["tagName"] }],
+ code: "Backbone.Collection.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", options: [{ View: ["className", "events"], Collection: ["tagName"] }],
  errors: [ { message: "Initialize should be declared at the top of the collection." } ]
  },
  {
- code: "Backbone.Model.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", args: [1, { View: ["tagName", "className", "events"] }],
+ code: "Backbone.Model.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", options: [{ View: ["tagName", "className", "events"] }],
  errors: [ { message: "Initialize should be declared at the top of the model." } ]
  },
  {
  code: "Backbone.View.extend({ tagName: 'div', initialize: function() {} });",
  errors: [ { message: "Initialize should be declared at the top." } ]
  },
  {
- code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", args: [1, { Model: ["defaults"] }],
+ code: "Backbone.View.extend({ tagName: 'div', 'className': 'test', events: {}, initialize: function() {} });", options: [{ Model: ["defaults"] }],
  errors: [ { message: "Initialize should be declared at the top of the view." } ]
  },
  {
- code: "Backbone.Model.extend({ defaults: {}, initialize: function() {} });", args: [1, { View: ["className", "events"] }],
+ code: "Backbone.Model.extend({ defaults: {}, initialize: function() {} });", options: [{ View: ["className", "events"] }],
  errors: [ { message: "Initialize should be declared at the top of the model." } ]
  },
  {
- code: "Backbone.Collection.extend({ model: {}, initialize: function() {} });", args: [1, { View: ["className", "events"] }],
+ code: "Backbone.Collection.extend({ model: {}, initialize: function() {} });", options: [{ View: ["className", "events"] }],
  errors: [ { message: "Initialize should be declared at the top of the collection." } ]
  }
  ]

diff --git a/tests/lib/rules/model-defaults.js b/tests/lib/rules/model-defaults.js
@@ -8,15 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var eslint = require("eslint").linter,
- ESLintTester = require("eslint-tester");
+var RuleTester = require("eslint").RuleTester;
+var rule = require("../../../lib/rules/model-defaults");
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint);
-eslintTester.addRuleTest("lib/rules/model-defaults", {
+var eslintTester = new RuleTester();
+eslintTester.run("model-defaults", rule, {
 
  valid: [
  "Backbone.Model.extend({ defaults: {}});",