diff --git a/package.json b/package.json index bcbd23d4..90600c02 100644 --- a/package.json +++ b/package.json @@ -33,16 +33,17 @@ "compile": "rc-tools run compile --babel-runtime", "pub": "rc-tools run pub --babel-runtime", "lint": "rc-tools run lint", - "test": "rc-tools run test", - "coverage": "rc-tools run coverage" + "test": "jest", + "coverage": "jest --coverage && cat ./coverage/lcov.info | coveralls" }, "devDependencies": { "co-busboy": "^1.3.0", + "coveralls": "^2.13.1", "expect.js": "0.3.x", + "jest": "^20.0.1", "pre-commit": "1.x", "rc-tools": "6.x", "react": "15.x", - "react-addons-test-utils": "15.x", "react-dom": "15.x", "sinon": "2.0.0-pre.2" }, @@ -54,5 +55,17 @@ "classnames": "^2.2.5", "warning": "2.x", "prop-types": "^15.5.7" + }, + "jest": { + "collectCoverageFrom": [ + "src/*" + ], + "coveragePathIgnorePatterns": [ + "src/IframeUploader.jsx" + ], + "transform": { + "\\.tsx?$": "./node_modules/rc-tools/scripts/jestPreprocessor.js", + "\\.jsx?$": "./node_modules/rc-tools/scripts/jestPreprocessor.js" + } } } diff --git a/tests/request.spec.js b/tests/request.spec.js index 7a2ab09e..b2a3d4b1 100644 --- a/tests/request.spec.js +++ b/tests/request.spec.js @@ -43,8 +43,7 @@ describe('request', () => { requests[0].respond(200, {}, '{"success": true}'); }); - it.skip('40x code should be error', function callback(done) { - this.timeout(200000); + it('40x code should be error', done => { option.onError = e => { expect(e.toString()).to.contain('404'); done(); diff --git a/tests/uploader.spec.js b/tests/uploader.spec.js index 38f27d13..c7c79e54 100644 --- a/tests/uploader.spec.js +++ b/tests/uploader.spec.js @@ -3,7 +3,7 @@ import expect from 'expect.js'; import Uploader from '../index'; import React from 'react'; import ReactDOM from 'react-dom'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; const { Simulate } = TestUtils; import sinon from 'sinon';