Merge pull request #15 from Legitcode/feature/react-14

zackify · zackify · commit d507ec735ed0 · 2015-10-07T12:49:11.000-07:00
Waiting for react .14 :)
diff --git a/.eslintrc b/.eslintrc
@@ -33,7 +33,7 @@
     "react/no-multi-comp": 1,
     "react/no-unknown-property": 1,
     "react/prop-types": 0,
-    "react/react-in-jsx-scope": 1,
+    "react/react-in-jsx-scope": 0,
     "react/self-closing-comp": 1,
     "react/sort-comp": 1,
     "react/wrap-multilines": 1,
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "legit-tests",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "a chainable testing library for React",
   "main": "legit-tests.js",
   "scripts": {
@@ -28,25 +28,27 @@
   },
   "homepage": "https://github.com/legitcode/tests#readme",
   "devDependencies": {
-    "alt": "^0.17.3",
+    "alt": "^0.17.4",
     "babel": "^5.8.23",
     "babel-core": "^5.8.25",
     "babel-eslint": "^4.1.3",
     "babel-loader": "^5.3.2",
     "babel-runtime": "^5.8.25",
     "chai": "^3.3.0",
-    "eslint": "^1.5.1",
-    "eslint-plugin-react": "^3.4.2",
-    "expect": "^1.10.0",
+    "eslint": "^1.6.0",
+    "eslint-plugin-react": "^3.5.1",
+    "expect": "^1.12.0",
     "harmony-reflect": "^1.4.2",
     "mocha": "^2.3.3",
     "mocha-babel": "^3.0.0",
     "react-hot-loader": "^1.3.0",
-    "sinon": "^1.17.0",
+    "sinon": "^1.17.1",
     "webpack": "^1.12.2"
   },
   "dependencies": {
     "jsdom": "^6.5.1",
-    "react": "^0.13.3"
+    "react": "^0.14.0",
+    "react-addons-test-utils": "^0.14.0",
+    "react-dom": "^0.14.0"
   }
 }
diff --git a/src/middleware/find.js b/src/middleware/find.js
@@ -1,7 +1,7 @@
-import React from 'react'
-let { TestUtils } = React.addons
+import TestUtils from 'react-addons-test-utils'
 
 export default function find(selector){
+
   let elements, name
   if (!(typeof selector === "string")) {
     name = selector.name.toLowerCase()
diff --git a/src/middleware/simulate.js b/src/middleware/simulate.js
@@ -1,5 +1,4 @@
-import React from 'react'
-let { TestUtils } = React.addons
+import TestUtils from 'react-addons-test-utils'
 
 export default function simulate(data) {
   let element
diff --git a/src/tests.js b/src/tests.js
@@ -1,7 +1,7 @@
-import React from 'react/addons'
-let { TestUtils } = React.addons
+import TestUtils from 'react-addons-test-utils'
+import ReactDOMServer from 'react-dom/server'
+import React from 'react'
 global.React = React
-require('react/lib/ExecutionEnvironment').canUseDOM = true
 
 import { Find, SetState, Simulate } from './middleware'
 
@@ -59,7 +59,7 @@ function Test(component, config) {
       return this
     },
     renderToString(callback) {
-      const componentString = React.renderToStaticMarkup(component)
+      const componentString = ReactDOMServer.renderToStaticMarkup(component)
       callback.call(null, componentString)
       return this
     }
diff --git a/tests/components/component.jsx b/tests/components/component.jsx
@@ -9,7 +9,7 @@ export default class TestComponent extends Component {
 
   render(){
     return (
-      <body>
+      <section>
         <div onClick={this.props.onClick}>{this.state.test}</div>
         <p className="box">found me!</p>
         <button
@@ -23,7 +23,7 @@ export default class TestComponent extends Component {
           Click Me
         </button>
         <TinyComponent test="true"/>
-      </body>
+      </section>
     )
   }
 }
diff --git a/tests/element.jsx b/tests/element.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { expect } from 'chai'
 
diff --git a/tests/find.jsx b/tests/find.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { Find } from '../src/middleware'
 import { expect } from 'chai'
@@ -25,7 +23,7 @@ describe('Find middleware', () => {
     Test(<TestComponent/>)
     .use(Find, '.box')
     .test(({box}) => {
-      expect(box.props.children).to.be.equal('found me!')
+      expect(box.innerHTML).to.be.equal('found me!')
     })
 
   })
diff --git a/tests/mixin.jsx b/tests/mixin.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { Find } from '../src/middleware'
 import { expect } from 'chai'
diff --git a/tests/no-dom.jsx b/tests/no-dom.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/no-dom'
 import { expect } from 'chai'
 
diff --git a/tests/renderToString.jsx b/tests/renderToString.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { expect } from 'chai'
 
diff --git a/tests/setState.jsx b/tests/setState.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { expect } from 'chai'
 import { SetState, Find } from '../src/middleware'
diff --git a/tests/shallowRender.jsx b/tests/shallowRender.jsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
 import { expect } from 'chai'
 
diff --git a/tests/simulate.jsx b/tests/simulate.jsx
@@ -1,7 +1,4 @@
-import React from 'react'
-
 import Test from '../src/legit-tests'
-import { Find, Simulate } from '../src/middleware'
 import { expect } from 'chai'
 import sinon from 'sinon'
 
@@ -13,9 +10,8 @@ describe('simulate middleware', () => {
     let spy = sinon.spy()
 
     Test(<TestComponent onClick={spy}/>)
-    .use(Find, 'div')
-    .use(Simulate, {method: 'click', element: 'div'})
-
+    .find('div')
+    .simulate({method: 'click', element: 'div'})
     expect(spy.called).to.be.true
 
   })
diff --git a/tests/store.jsx b/tests/store.jsx
diff --git a/tests/testStore.js b/tests/testStore.js

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export default class TestComponent extends Component {`
`9`	`9`
`10`	`10`	`render(){`
`11`	`11`	`return (`
`12`		`- <body>`
	`12`	`+ <section>`
`13`	`13`	`<div onClick={this.props.onClick}>{this.state.test}</div>`
`14`	`14`	`<p className="box">found me!</p>`
`15`	`15`	`<button`
`@@ -23,7 +23,7 @@ export default class TestComponent extends Component {`
`23`	`23`	`Click Me`
`24`	`24`	`</button>`
`25`	`25`	`<TinyComponent test="true"/>`
`26`		`- </body>`
	`26`	`+ </section>`
`27`	`27`	`)`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import React from 'react'`
`2`		`-`
`3`	`1`	`import Test from '../src/legit-tests'`
`4`	`2`	`import { expect } from 'chai'`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import React from 'react'`
`2`		`-`
`3`	`1`	`import Test from '../src/no-dom'`
`4`	`2`	`import { expect } from 'chai'`
`5`	`3`