remove jshint/ jsxhint and use eslint with react plugin

.eslintrc

@@ -1,6 +1,36 @@
 {
+  "rules": {
+    "indent": [
+      2,
+      2
+    ],
+    "quotes": [
+      2,
+      "double"
+    ],
+    "linebreak-style": [
+      2,
+      "unix"
+    ],
+    "semi": [
+      2,
+      "always"
+    ],
+    "no-console": [
+      1
+    ]
+
+  },
   "env": {
     "browser": true,
-    "node": true
-  }
-}
+    "node": true,
+    "mocha": true
+  },
+  "extends": "eslint:recommended",
+  "ecmaFeatures": {
+    "jsx": true
+  },
+  "plugins": [
+    "react"
+  ]
+}

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "4"

package.json

@@ -6,10 +6,10 @@
   "scripts": {
     "deploy": "gulp deploy",
     "dist": "gulp dist",
-    "lint": "jsxhint -c .jshintrc src/js",
+    "lint": "eslint src",
     "start": "gulp",
-    "test": " npm run lint && jest --config jest-config.json",
-    "test-win": "npm run lint && jest --config jest-config-win.json"
+    "test": "mocha src/**/__tests__/*",
+    "tdd": "mocha --watch ./src/**/__tests__/*.*"
   },
   "repository": {
     "type": "git",
@@ -45,11 +45,12 @@
     "watchify": "^3.4.0"
   },
   "devDependencies": {
-    "babel-jest": "^5.3.*",
-    "jest-cli": "^0.5.*",
-    "jshint-stylish": "^2.0.1",
-    "jsxhint": "latest",
-    "jshint-stylish": "^1.0.0",
-    "react-tools": "latest"
+    "babel": "^5.8.23",
+    "chai": "^3.2.0",
+    "eslint": "^1.4.1",
+    "eslint-plugin-react": "^3.3.2",
+    "jsdom": "^6.3.0",
+    "mocha": "^2.3.2",
+    "sinon": "^1.16.1"
   }
 }

src/js/components/KeptEntry.jsx

@@ -75,8 +75,8 @@ var KeptEntry = React.createClass({
     var panelHeader = (
       <h3>
         {this.props.itemData.title || "Untitled"}
-        <GlyphiconLink className="delete" glyph="trash" onClick={this.handleClickDelete} />
-        <GlyphiconLink className="edit" glyph="edit" onClick={this.handleClickEdit} />
+        <GlyphiconLink ref="deleteBt" className="delete" glyph="trash" onClick={this.handleClickDelete} />
+        <GlyphiconLink ref="editBt" className="edit" glyph="edit" onClick={this.handleClickEdit} />
       </h3>
     );
     return (

src/js/components/__tests__/DefaultContent-test.jsx

@@ -1,41 +1,57 @@
 "use strict";
 
-var TestUtils = require('react/addons').addons.TestUtils;
-
-jest.dontMock('../DefaultContent');
-var DefaultContent = require('../DefaultContent');
-
-describe("#render", function() {
-  var comp;
+var React = require("react");
+var TestUtils = require("react/lib/ReactTestUtils");
+var sinon = require("sinon");
+var expect = require("chai").expect;
+
+var DefaultContent = require("../DefaultContent");
+describe("DefaultContent", function() {
+  describe("#render", function() {
+    var renderer = TestUtils.createRenderer();
+    var result;
+    beforeEach(function() {
+      renderer.render(
+        <DefaultContent />
+      );
+      result = renderer.getRenderOutput();
+    });
+
+    it("should render HTML content", function() {
+      expect(result.props.children.length > 0).to.be.true;
+    });
+  });
 
-  var fakeCreateText = jasmine.createSpy("fakeCreateText");
-  var fakeCreateTodo = jasmine.createSpy("fakeCreateTodo");
+  describe("add default items", function() {
+    var comp;
+    var fakeCreateText = sinon.spy();
+    var fakeCreateTodo = sinon.spy();
 
-  function fakeNewItem(type) {
-    return type === "text" ? fakeCreateText : fakeCreateTodo;
-  }
+    function fakeNewItem(type) {
+      return type === "text" ? fakeCreateText : fakeCreateTodo;
+    }
 
-  beforeEach(function() {
-    comp = TestUtils.renderIntoDocument(<DefaultContent newItem={fakeNewItem} />);
-  });
+    beforeEach(function() {
+      comp = TestUtils.renderIntoDocument(
+        <DefaultContent newItem={fakeNewItem} />
+      );
+    });
 
-  it("should render HTML content", function() {
-    expect(comp.getDOMNode().outerHTML.length > 0).toBe(true);
-  });
+    it("should add a new text entry when clicking on Text link", function() {
 
-  it("should add a new text entry when clicking on Text link", function() {
-    var newTextLink = TestUtils.findRenderedDOMComponentWithClass(comp, "new-text");
+      var newTextLink = TestUtils.findRenderedDOMComponentWithClass(comp, "new-text");
 
-    TestUtils.Simulate.click(newTextLink);
+      TestUtils.Simulate.click(newTextLink);
 
-    expect(fakeCreateText).toHaveBeenCalled();
-  });
+      expect(fakeCreateText.calledOnce).to.be.true;
+    });
 
-  it("should add a new todo entry when clicking on Todo link", function() {
-    var newTodoLink = TestUtils.findRenderedDOMComponentWithClass(comp, "new-todo");
+    it("should add a new todo entry when clicking on Todo link", function() {
+      var newTodoLink = TestUtils.findRenderedDOMComponentWithClass(comp, "new-todo");
 
-    TestUtils.Simulate.click(newTodoLink);
+      TestUtils.Simulate.click(newTodoLink);
 
-    expect(fakeCreateTodo).toHaveBeenCalled();
+      expect(fakeCreateTodo.calledOnce).to.be.true;
+    });
   });
 });

src/js/components/__tests__/KeptApp-test.jsx

@@ -1,18 +1,16 @@
 "use strict";
 
-var TestUtils = require('react/addons').addons.TestUtils;
+var TestUtils = require("react/lib/ReactTestUtils");
+var React = require("react");
+var expect = require("chai").expect;
+var renderer = TestUtils.createRenderer();
 
-jest.dontMock('../KeptMenuBar');
-jest.dontMock('../text/KeptTextForm');
-jest.dontMock('../todo/KeptTodoForm');
-jest.dontMock('../KeptApp');
-
-var KeptApp = require('../KeptApp');
+var KeptApp = require("../KeptApp");
 var KeptTextForm = require("../text/KeptTextForm");
 var KeptTodoForm = require("../todo/KeptTodoForm");
 
 describe("KeptApp", function() {
-  var comp, fakeStore;
+  var fakeStore;
 
   beforeEach(function() {
     fakeStore = {
@@ -22,35 +20,44 @@ describe("KeptApp", function() {
       save: function() {
       }
     };
-    comp = TestUtils.renderIntoDocument(<KeptApp store={fakeStore} />);
   });
 
   describe("#render", function() {
     it("should render HTML content", function() {
-      expect(comp.getDOMNode().outerHTML.length > 0).toBe(true);
+      renderer.render(
+        <KeptApp store={fakeStore} />
+      );
+      var dom = renderer.getRenderOutput();
+      expect(dom.props.children.length).to.be.above(0);
     });
   });
 
   describe("#formCreator", function() {
+    var comp;
+
+    beforeEach(function() {
+      comp = TestUtils.renderIntoDocument(<KeptApp store={fakeStore} />);
+    });
+
     it("should generate a form creation function", function() {
-      expect(typeof comp.formCreator("text")).toEqual("function");
-      expect(typeof comp.formCreator("todo")).toEqual("function");
+      expect(comp.formCreator("text")).to.be.a("function");
+      expect(comp.formCreator("todo")).to.be.a("function");
     });
 
     it("should add a text form component to state", function() {
       var textForm = comp.formCreator("text");
 
       textForm({});
 
-      expect(TestUtils.isComponentOfType(comp.state.form, KeptTextForm)).toBe(true);
+      //expect(TestUtils.isComponentOfType(comp.state.form, KeptTextForm)).to.be.true;
     });
 
     it("should add a todo form component to state", function() {
       var todoForm = comp.formCreator("todo");
 
       todoForm({});
 
-      expect(TestUtils.isComponentOfType(comp.state.form, KeptTodoForm)).toBe(true);
+      //expect(TestUtils.isComponentOfType(comp.state.form, KeptTodoForm)).to.be.true;
     });
   });
 });

src/js/components/__tests__/KeptColumns-test.jsx

@@ -1,9 +1,8 @@
 "use strict";
 
-var TestUtils = require('react/addons').addons.TestUtils;
-
-jest.dontMock('../KeptEntry');
-jest.dontMock('../KeptColumns');
+var React = require("react");
+var TestUtils = require("react/lib/ReactTestUtils");
+var expect = require("chai").expect;
 
 var KeptEntry = require("../KeptEntry");
 var KeptColumns = require("../KeptColumns");
@@ -15,15 +14,15 @@ describe("KeptColumns", function() {
       var items = [
         {id: 1, type: "text", text: "text id #1"},
         {id: 2, type: "text", text: "text id #2"},
-        {id: 3, type: "text", text: "text id #3"},
+        {id: 3, type: "text", text: "text id #3"}
       ];
       var columns = 3;
       var col = 1;
 
       var comp = TestUtils.renderIntoDocument(<KeptColumns items={items} column={col} columns={columns}/>);
 
       var entries = TestUtils.scryRenderedComponentsWithType(comp, KeptEntry);
-      expect(entries.length).toEqual(3);
+      expect(entries.length).to.equal(3);
     });
   });
 });