Merge pull request #19 from IntrepidPursuits/drf-switch-over-to-jest-…

…and-react-15-latest Switch over to jest and React 15.5.4
IntrepidPursuits · May 20, 2017 · ece04b0 · ece04b0
2 parents 7aedd82 + 78baa67
commit ece04b0
Show file tree

Hide file tree

Showing 43 changed files with 1,824 additions and 1,528 deletions.
diff --git a/README.md b/README.md
@@ -69,12 +69,12 @@ as well if you are missing them.
 ```
 $ npm install --save-dev enzyme
 $ npm install --save-dev react-dom
-$ npm install --save-dev react-addons-test-utils
+$ npm install --save-dev react-test-renderer
 ```
 
 If you are new to testing in React, check out the following guides to get you up and running:
 
-* [Set up with Jest in Create React App](docs/faq/installation-jest.md)
+* [Set up with Jest in Create React App (Recommended)](docs/faq/installation-jest.md)
 * [Set up Karma with Mocha and Chai in Create React App](docs/faq/installation-karma-mocha-chai.md)
 * [Set up Karma with Jasmine in Create React App](docs/faq/installation-karma-jasmine.md)
 

diff --git a/docs/faq/installation-jest.md b/docs/faq/installation-jest.md
@@ -5,7 +5,7 @@
 1. Install [Create React App](https://github.com/facebookincubator/create-react-app)
 
   ```
-  $ npm install -g create-react-app@1.0.3
+  $ npm install -g create-react-app@1.3.1
   ```
 
 2. Create a new React application
@@ -15,10 +15,10 @@
   $ cd my-app
   ```
 
-3. Install `react-page-object`, `enzyme`, and `react-addons-test-utils`
+3. Install `react-page-object`, `enzyme`, and `react-test-renderer`
 
   ```
-  $ npm i -D react-page-object enzyme@2.7.0 react-addons-test-utils@15.4.1
+  $ npm i -D react-page-object enzyme@2.8.2 react-test-renderer@15.5.4
   ```
 
 4. Modify the contents of `src/App.test.js` to be:

diff --git a/docs/faq/installation-karma-jasmine.md b/docs/faq/installation-karma-jasmine.md
@@ -5,7 +5,7 @@
 1. Install [Create React App](https://github.com/facebookincubator/create-react-app)
 
   ```
-  $ npm install -g create-react-app@1.0.3
+  $ npm install -g create-react-app@1.3.1
   ```
 
 2. Create a new React application and eject from it
@@ -31,10 +31,10 @@
   $ npm i -D [email protected] [email protected]
   ```
 
-5. Install `react-page-object`, `enzyme`, and `react-addons-test-utils`
+5. Install `react-page-object`, `enzyme`, and `react-test-renderer`
 
   ```
-  $ npm i -D react-page-object enzyme@2.7.0 react-addons-test-utils@15.4.1
+  $ npm i -D react-page-object enzyme@2.8.2 react-test-renderer@15.5.4
   ```
 
 6. Modify your `package.json` `scripts` to be

diff --git a/docs/faq/installation-karma-mocha-chai.md b/docs/faq/installation-karma-mocha-chai.md
@@ -5,7 +5,7 @@
 1. Install [Create React App](https://github.com/facebookincubator/create-react-app)
 
   ```
-  $ npm install -g create-react-app@1.0.3
+  $ npm install -g create-react-app@1.3.1
   ```
 
 2. Create a new React application and eject from it
@@ -31,10 +31,10 @@
   $ npm i -D [email protected] [email protected] [email protected] [email protected]
   ```
 
-5. Install `react-page-object`, `enzyme`, and `react-addons-test-utils`
+5. Install `react-page-object`, `enzyme`, and `react-test-renderer`
 
   ```
-  $ npm i -D react-page-object enzyme@2.7.0 react-addons-test-utils@15.4.1
+  $ npm i -D react-page-object enzyme@2.8.2 react-test-renderer@15.5.4
   ```
 
 6. Modify your `package.json` `scripts` to be

diff --git a/karma.conf.js b/karma.conf.js
diff --git a/test/blurFocusedElementSpec.js → lib/__tests__/blurFocusedElement.js b/test/blurFocusedElementSpec.js → lib/__tests__/blurFocusedElement.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('blurFocusedElementSpec', () => {
   let page
@@ -24,6 +24,7 @@ describe('blurFocusedElementSpec', () => {
       window.spyOn(fakeWrapper, 'simulate')
       page.blurFocusedElement()
       expect(fakeWrapper.simulate).toHaveBeenCalledWith('blur')
+      expect(true).toBe(true)
     })
 
     it('should set focusedWrapper to null', () => {

diff --git a/test/checkSpec.js → lib/__tests__/checkSpec.js b/test/checkSpec.js → lib/__tests__/checkSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('checkSpec', () => {
   let onBlur, onChange, onFocus, page, secondOnChange

diff --git a/test/chooseSpec.js → lib/__tests__/chooseSpec.js b/test/chooseSpec.js → lib/__tests__/chooseSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('chooseSpec', () => {
   let onBlur, onChange, onFocus, page, secondOnChange

diff --git a/test/clickButtonSpec.js → lib/__tests__/clickButtonSpec.js b/test/clickButtonSpec.js → lib/__tests__/clickButtonSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('clickButtonSpec', () => {
   let onBlur, onClick, onFocus, page

diff --git a/test/clickInputSpec.js → lib/__tests__/clickInputSpec.js b/test/clickInputSpec.js → lib/__tests__/clickInputSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('clickInputSpec', () => {
   let onBlur, onClick, onFocus, page

diff --git a/test/clickLinkSpec.js → lib/__tests__/clickLinkSpec.js b/test/clickLinkSpec.js → lib/__tests__/clickLinkSpec.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Page from 'react-page-object'
-import { BrowserRouter, Link, Match } from 'react-router'
+import Page from '../index'
+import { BrowserRouter, Link, Route } from 'react-router-dom'
 
 describe('clickLinkSpec', () => {
   let onBlur, onFocus, page
@@ -30,10 +30,10 @@ describe('clickLinkSpec', () => {
   const LinksReactRouter = ({ onBlur, onFocus }) => (
     <BrowserRouter>
       <div>
-        <Match exactly pattern="/" component={() => <Link id="propValueFirst" to="/second" onBlur={onBlur} onFocus={onFocus} />} />
-        <Match pattern="/second" component={() => <Link to="/third">propValueSecond</Link>} />
-        <Match pattern="/third" component={() => <Link to="/prop-value-third" />} />
-        <Match pattern="/prop-value-third" component={() => <Link className="propValueFourth" to="/" />} />
+        <Route exact pattern="/" component={() => <Link id="propValueFirst" to="/second" onBlur={onBlur} onFocus={onFocus} />} />
+        <Route pattern="/second" component={() => <Link to="/third">propValueSecond</Link>} />
+        <Route pattern="/third" component={() => <Link to="/prop-value-third" />} />
+        <Route pattern="/prop-value-third" component={() => <Link className="propValueFourth" to="/" />} />
       </div>
     </BrowserRouter>
   )

diff --git a/test/constructorSpec.js → lib/__tests__/constructorSpec.js b/test/constructorSpec.js → lib/__tests__/constructorSpec.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
-import Page from 'react-page-object'
-import { BrowserRouter, Match } from 'react-router'
+import Page from '../index'
+import { BrowserRouter, Link, Route } from 'react-router-dom'
 
 describe('constructorSpec', () => {
   let page
@@ -43,7 +43,7 @@ describe('constructorSpec', () => {
     const TestComponentWithRouter = () => (
       <BrowserRouter>
         <div>
-          <Match exactly pattern="/" component={PageOne} />
+          <Route exact path="/" component={PageOne} />
         </div>
       </BrowserRouter>
     )

diff --git a/test/contentMatchesSpec.js → lib/__tests__/contentMatchesSpec.js b/test/contentMatchesSpec.js → lib/__tests__/contentMatchesSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('contentMatchesSpec', () => {
   let page

diff --git a/test/contentSpec.js → lib/__tests__/contentSpec.js b/test/contentSpec.js → lib/__tests__/contentSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('contentSpec', () => {
   let page

diff --git a/test/currentPathSpec.js → lib/__tests__/currentPathSpec.js b/test/currentPathSpec.js → lib/__tests__/currentPathSpec.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Page from 'react-page-object'
-import { BrowserRouter, Link, Match } from 'react-router'
+import Page from '../index'
+import { BrowserRouter, Link, Route } from 'react-router-dom'
 
 describe('currentPathSpec', () => {
   let page
@@ -10,8 +10,8 @@ describe('currentPathSpec', () => {
     <BrowserRouter>
       <div>
         <Link to="/two">Go To Page Two</Link>
-        <Match exactly pattern="/" component={PageOne} />
-        <Match pattern="/two" component={PageTwo} />
+        <Route exact path="/" component={PageOne} />
+        <Route path="/two" component={PageTwo} />
       </div>
     </BrowserRouter>
   )

diff --git a/test/destroySpec.js → lib/__tests__/destroySpec.js b/test/destroySpec.js → lib/__tests__/destroySpec.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('destroySpec', () => {
   let page

diff --git a/test/fillInSpec.js → lib/__tests__/fillInSpec.js b/test/fillInSpec.js → lib/__tests__/fillInSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('fillInSpec', () => {
   let onBlur, onChange, onFocus, page

diff --git a/test/fillInTextAreaSpec.js → lib/__tests__/fillInTextAreaSpec.js b/test/fillInTextAreaSpec.js → lib/__tests__/fillInTextAreaSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('fillInTextareaSpec', () => {
   let onBlur, onChange, onFocus, page

diff --git a/test/findWrapperForCheckSpec.js → lib/__tests__/findWrapperForCheckSpec.js b/test/findWrapperForCheckSpec.js → lib/__tests__/findWrapperForCheckSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForCheckSpec', () => {
   let page
@@ -43,7 +43,7 @@ describe('findWrapperForCheckSpec', () => {
     it('should return ReactWrappers for inputs whose type prop value is \'checkbox\' and className prop matches the propValue', () => {
       page = new Page(<InputsCustom />)
       const wrapper = page.findWrapperForCheck('propValue', { propToCheck: 'className' })
-      expect(wrapper.html()).toEqual('<input type="checkbox" class="propValue" value="on">')
+      expect(wrapper.html()).toEqual('<input type="checkbox" class="propValue">')
     })
   })
 })
diff --git a/test/findWrapperForChooseSpec.js → lib/__tests__/findWrapperForChooseSpec.js b/test/findWrapperForChooseSpec.js → lib/__tests__/findWrapperForChooseSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForChooseSpec', () => {
   let page
@@ -43,7 +43,7 @@ describe('findWrapperForChooseSpec', () => {
     it('should return ReactWrappers for inputs whose type prop value is \'radio\' and className prop matches the propValue', () => {
       page = new Page(<InputsCustom />)
       const wrapper = page.findWrapperForChoose('propValue', { propToCheck: 'className' })
-      expect(wrapper.html()).toEqual('<input type="radio" class="propValue" value="on">')
+      expect(wrapper.html()).toEqual('<input type="radio" class="propValue">')
     })
   })
 })
diff --git a/test/findWrapperForClickButtonSpec.js → ..._tests__/findWrapperForClickButtonSpec.js b/test/findWrapperForClickButtonSpec.js → ..._tests__/findWrapperForClickButtonSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForClickButtonSpec', () => {
   let page

diff --git a/test/findWrapperForClickInputSpec.js → ...__tests__/findWrapperForClickInputSpec.js b/test/findWrapperForClickInputSpec.js → ...__tests__/findWrapperForClickInputSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForClickInputSpec', () => {
   let page

diff --git a/test/findWrapperForClickLinkSpec.js → lib/__tests__/findWrapperForClickLinkSpec.js b/test/findWrapperForClickLinkSpec.js → lib/__tests__/findWrapperForClickLinkSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForClickLinkSpec', () => {
   let page

diff --git a/test/findWrapperForFillInSpec.js → lib/__tests__/findWrapperForFillInSpec.js b/test/findWrapperForFillInSpec.js → lib/__tests__/findWrapperForFillInSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForFillInSpec', () => {
   let page

diff --git a/test/findWrapperForFillInTextareaSpec.js → ...sts__/findWrapperForFillInTextareaSpec.js b/test/findWrapperForFillInTextareaSpec.js → ...sts__/findWrapperForFillInTextareaSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForFillInTextareaSpec', () => {
   let page

diff --git a/test/findWrapperForSelectSpec.js → lib/__tests__/findWrapperForSelectSpec.js b/test/findWrapperForSelectSpec.js → lib/__tests__/findWrapperForSelectSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('findWrapperForSelectSpec', () => {
   let page

diff --git a/test/outputOpenPageCodeSpec.js → lib/__tests__/outputOpenPageCodeSpec.js b/test/outputOpenPageCodeSpec.js → lib/__tests__/outputOpenPageCodeSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('outputOpenPageCodeSpec', () => {
   let page

diff --git a/test/selectSpec.js → lib/__tests__/selectSpec.js b/test/selectSpec.js → lib/__tests__/selectSpec.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Page from 'react-page-object'
+import Page from '../index'
 
 describe('selectSpec', () => {
   let onBlur, onChange, onFocus, page