Skip to content

Commit

Permalink
Merge pull request #3 from airbnb/use_adapter_helper
Browse files Browse the repository at this point in the history
[Tests] Use adapter helper
  • Loading branch information
ljharb committed Nov 18, 2017
2 parents e8e8962 + 752feb5 commit e51d7f9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 45 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Expand Up @@ -3,8 +3,10 @@ node_js:
- "8"
- "6"
- "4"
before_script:
- 'if [ -n "${REACT-}" ] && [ "${TEST-}" = true ]; then sh install-relevant-react.sh; fi'
before_install:
- 'nvm install-latest-npm'
install:
- 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.9" ]; then nvm install --latest-npm 0.8 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
script:
- 'if [ -n "${LINT-}" ]; then npm run lint; fi'
- 'if [ "${TEST-}" = true ]; then npm run test:only; fi'
Expand Down
21 changes: 0 additions & 21 deletions install-relevant-react.sh

This file was deleted.

8 changes: 3 additions & 5 deletions package.json
Expand Up @@ -13,14 +13,11 @@
"build": "babel src --out-dir dist",
"lint": "eslint .",
"pretest": "npm run lint",
"pretest:only": "npm run react",
"test:only": "jest",
"test": "npm run test:only",
"clean": "rimraf dist",
"react:clean": "npm uninstall --no-save react react-dom react-test-renderer react-addons-test-utils enzyme-adapter-react-14 enzyme-adapter-react-15.4 enzyme-adapter-react-15 enzyme-adapter-react-16 && rimraf node_modules/react-test-renderer node_modules/react && npm prune",
"react:14": "npm run react:clean && npm i --no-save react@0.14 react-dom@0.14 react-addons-test-utils@0.14 enzyme-adapter-react-14 && npm prune && npm i --no-save react-addons-test-utils@0.14 enzyme-adapter-react-14",
"react:15.4": "npm run react:clean && npm i --no-save react@15.4 react-dom@15.4 react-addons-test-utils@15.4 enzyme-adapter-react-15.4 react-test-renderer@15.4 && npm prune && npm i --no-save react-addons-test-utils@15.4 enzyme-adapter-react-15.4",
"react:15": "npm run react:clean && npm i --no-save react@15 react-dom@15 react-test-renderer@15 react-addons-test-utils@15 enzyme-adapter-react-15 && npm prune && npm i --no-save react-addons-test-utils@15 enzyme-adapter-react-15",
"react:16": "npm run react:clean && npm i --no-save react@16 react-dom@16 react-test-renderer@16 enzyme-adapter-react-16 && npm prune && npm i --no-save enzyme-adapter-react-16",
"react": "enzyme-adapter-react-install 16",
"prepublish": "safe-publish-latest"
},
"dependencies": {
Expand All @@ -41,6 +38,7 @@
"chai": "^4.1.2",
"chai-enzyme": "^1.0.0-beta.0",
"enzyme": "^3.1.0",
"enzyme-adapter-react-helper": "^1.0.3",
"eslint": "^4.9.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.7.0",
Expand Down
19 changes: 2 additions & 17 deletions tests/_helpers.jsx
Expand Up @@ -3,25 +3,10 @@ import chai from 'chai';
import sinonChai from 'sinon-chai';
import sinon from 'sinon-sandbox';
import chaiEnzyme from 'chai-enzyme';
import Enzyme from 'enzyme';

let Adapter;
import configure from 'enzyme-adapter-react-helper';

try {
Adapter = require('enzyme-adapter-react-16');
} catch (e) {
try {
Adapter = require('enzyme-adapter-react-15');
} catch (e) {
try {
Adapter = require('enzyme-adapter-react-15.4');
} catch (e) {
Adapter = require('enzyme-adapter-react-14');
}
}
}

Enzyme.configure({ adapter: new Adapter(), disableLifecycleMethods: true });
configure({ disableLifecycleMethods: true });

chai.use(sinonChai);
chai.use(chaiEnzyme());
Expand Down

0 comments on commit e51d7f9

Please sign in to comment.