Skip to content

Commit

Permalink
updated to react 16, new enzyme testing environment
Browse files Browse the repository at this point in the history
  • Loading branch information
maxwell committed Oct 10, 2017
1 parent f45c92b commit 3851ec8
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 22 deletions.
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@
"version": "0.1.0",
"private": true,
"devDependencies": {
"babel-preset-env": "^1.6.0",
"extract-text-webpack-plugin": "^3.0.1",
"html-webpack-plugin": "^2.30.1",
"jsdom": "^9.9.1",
"mocha": "^3.2.0",
"react-addons-test-utils": "^15.4.2",
"react-scripts": "0.9.0",
"sinon": "^1.17.6",
"webpack": "^1.14.0",
"webpack-dev-server": "^1.16.2"
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1"
},
"dependencies": {
"babel-core": "^6.22.1",
"babel-loader": "^6.2.10",
"babel-loader": "^7.1.2",
"babel-preset-airbnb": "^2.1.1",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.22.0",
"babel-preset-stage-0": "^6.22.0",
"chai": "^3.5.0",
"cuid": "^1.3.8",
"enzyme": "^2.7.0",
"expect": "^1.20.2",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.1",
"expect": "^21.2.1",
"jquery": "^3.1.1",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.2",
"react-router-dom": "^4.0.0",
"react": "^16.0.0 ",
"react-dom": "^16.0.0 ",
"react-test-renderer": "^16.0.0",
"react-router-dom": "^4.2.2",
"sinon": "^1.17.7",
"superagent": "^3.3.2"
},
Expand Down
4 changes: 2 additions & 2 deletions src/containers/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {
BrowserRouter as Router,
import {
BrowserRouter as Router,
Route
} from 'react-router-dom';
import NavBar from '../components/NavBar';
Expand Down
9 changes: 6 additions & 3 deletions test/ActorsTest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react'
import sinon from 'sinon'
import { expect } from 'chai';
import { shallow } from 'enzyme'
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

// components
import Actors from '../src/components/Actors'
Expand All @@ -11,11 +14,11 @@ import { actors } from '../src/data'


describe('Actors', () => {
let wrapper;
let wrapper;

beforeEach(() => {
wrapper = shallow(<Actors />);
})
})

it('should render one <h1 />, inside of a <div />', () => {
expect(wrapper.children().first().type()).to.equal('h1');
Expand Down
5 changes: 4 additions & 1 deletion test/AppTest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react';
import sinon from 'sinon';
import { expect } from 'chai';
import { shallow } from 'enzyme';
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

// Components
import App from '../src/containers/App';
Expand Down
5 changes: 4 additions & 1 deletion test/DirectorsTest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react';
import sinon from 'sinon';
import { expect } from 'chai';
import { shallow } from 'enzyme'
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

// components
import Directors from '../src/components/Directors'
Expand Down
7 changes: 5 additions & 2 deletions test/HomeTest.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import React from 'react';
import sinon from 'sinon';
import { expect } from 'chai';
import { shallow } from 'enzyme';
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

import Home from '../src/components/Home';


describe('Home', () => {
let wrapper;
let wrapper;

beforeEach(() => {
wrapper = shallow(<Home />);
Expand Down
5 changes: 4 additions & 1 deletion test/MoviesTest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react';
import sinon from 'sinon';
import { expect } from 'chai';
import { shallow } from 'enzyme';
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

// components
import Movies from '../src/components/Movies';
Expand Down
7 changes: 5 additions & 2 deletions test/NavBarTest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react'
import sinon from 'sinon'
import { expect } from 'chai';
import { shallow } from 'enzyme';
import Enzyme, { shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';

Enzyme.configure({ adapter: new Adapter() })

// Components
import NavBar from '../src/components/NavBar';
Expand All @@ -18,7 +21,7 @@ describe('NavBar', () => {
})

describe('navlinks', () => {

it('renders a Home <NavLink>', () => {
const navLink = wrapper.findWhere(n => n.props().to === '/')
expect(navLink.childAt(0).text()).to.equal('Home');
Expand Down

0 comments on commit 3851ec8

Please sign in to comment.