react升级到15.x

uxcore · Oct 10, 2017 · cf87af7 · cf87af7
1 parent 99eae20
commit cf87af7
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,17 @@ language: node_js
 
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - xvfb
+
 notification:
   email:
     - [email protected]
 
 node_js:
-- 4.0.0
+- 6.9.0
 
 before_install:
 - |
@@ -17,6 +22,11 @@ before_install:
     exit
   fi
   phantomjs --version
+install:
+  - export DISPLAY=':99.0'
+  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  - npm install
+
 
 script:
 - |
@@ -25,7 +35,6 @@ script:
   else
     npm run $TEST_TYPE
   fi
-
 env:
   matrix:
   - TEST_TYPE=test
@@ -34,4 +43,4 @@ env:
 
 matrix:
   allow_failures:
-  - env: "TEST_TYPE=saucelabs"
+  - env: "TEST_TYPE=saucelabs"
diff --git a/package.json b/package.json
@@ -1,55 +1,59 @@
 {
- "name": "uxcore-input-form-field",
- "version": "0.1.14",
- "description": "uxcore-input-form-field component for uxcore.",
- "repository": "https://github.com/uxcore/uxcore-input-form-field.git",
- "author": "eternalsky",
- "main": "build/index.js",
- "scripts": {
-  "start": "uxcore-tools run start",
-  "server": "uxcore-tools run server",
-  "lint": "uxcore-tools run lint",
-  "build": "uxcore-tools run build",
-  "test": "uxcore-tools run test",
-  "coverage": "uxcore-tools run coverage",
-  "pub": "uxcore-tools run pub",
-  "dep": "uxcore-tools run dep",
-  "tnpm-dep": "uxcore-tools run tnpm-dep",
-  "chrome": "uxcore-tools run chrome",
-  "browsers": "uxcore-tools run browsers",
-  "saucelabs": "uxcore-tools run saucelabs",
-  "update": "uxcore-tools run update"
- },
- "bugs": {
-  "url": "http://github.com/uxcore/uxcore-input-form-field/issues"
- },
- "keywords": [
-  "react",
-  "react-component",
-  "uxcore-input-form-field",
-  "InputFormField",
-  "form"
- ],
- "devDependencies": {
-  "console-polyfill": "^0.2.2",
-  "enzyme": "^2.7.0",
-  "es5-shim": "^4.5.8",
-  "expect.js": "~0.3.1",
-  "kuma-base": "1.x",
-  "react": "0.14.x",
-  "react-addons-test-utils": "0.14.x",
-  "react-dom": "0.14.x",
-  "uxcore-form": "~1.3.11",
-  "uxcore-kuma": "2.x",
-  "uxcore-tools": "0.2.x",
-  "uxcore-validator": "~0.2.0"
- },
- "dependencies": {
-  "classnames": "^2.1.2",
-  "object-assign": "^4.0.0",
-  "uxcore-const": "0.0.2",
-  "uxcore-form-field": "~0.2.0"
- },
- "contributors": [],
- "license": "MIT"
+  "name": "uxcore-input-form-field",
+  "version": "0.1.14",
+  "description": "uxcore-input-form-field component for uxcore.",
+  "repository": "https://github.com/uxcore/uxcore-input-form-field.git",
+  "author": "eternalsky",
+  "main": "build/index.js",
+  "scripts": {
+    "start": "uxcore-tools run start",
+    "server": "uxcore-tools run server",
+    "lint": "uxcore-tools run lint",
+    "build": "uxcore-tools run build",
+    "test": "uxcore-tools run test",
+    "coverage": "uxcore-tools run coverage",
+    "pub": "uxcore-tools run pub",
+    "dep": "uxcore-tools run dep",
+    "tnpm-dep": "uxcore-tools run tnpm-dep",
+    "chrome": "uxcore-tools run chrome",
+    "browsers": "uxcore-tools run browsers",
+    "saucelabs": "uxcore-tools run saucelabs",
+    "update": "uxcore-tools run update",
+    "tnpm-update": "uxcore-tools run tnpm-update"
+  },
+  "bugs": {
+    "url": "http://github.com/uxcore/uxcore-input-form-field/issues"
+  },
+  "keywords": [
+    "react",
+    "react-component",
+    "uxcore-input-form-field",
+    "InputFormField",
+    "form"
+  ],
+  "devDependencies": {
+    "console-polyfill": "^0.2.2",
+    "enzyme": "^3.0.0",
+    "enzyme-adapter-react-15": "^1.0.0",
+    "es5-shim": "^4.5.8",
+    "expect.js": "~0.3.1",
+    "kuma-base": "1.x",
+    "react": "15.x",
+    "react-addons-test-utils": "15.x",
+    "react-dom": "15.x",
+    "react-test-renderer": "15.x",
+    "uxcore-form": "~1.3.11",
+    "uxcore-kuma": "*",
+    "uxcore-tools": "0.2.x",
+    "uxcore-validator": "~0.2.0"
+  },
+  "dependencies": {
+    "classnames": "^2.1.2",
+    "object-assign": "^4.0.0",
+    "prop-types": "15.x",
+    "uxcore-const": "0.0.2",
+    "uxcore-form-field": "~0.2.0"
+  },
+  "contributors": [],
+  "license": "MIT"
 }
diff --git a/src/InputFormField.jsx b/src/InputFormField.jsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-
+import PropTypes from 'prop-types';
 import FormField from 'uxcore-form-field';
 import Constants from 'uxcore-const';
 import classnames from 'classnames';
@@ -211,14 +211,14 @@ InputFormField.Count = FormCount;
 InputFormField.LeftAddon = LeftAddon;
 InputFormField.RightAddon = RightAddon;
 InputFormField.propTypes = assign({}, FormField.propTypes, {
-  IECompatible: React.PropTypes.bool,
-  onBlur: React.PropTypes.func,
-  onFocus: React.PropTypes.func,
-  onKeyDown: React.PropTypes.func,
-  renderView: React.PropTypes.func,
-  validateOnBlur: React.PropTypes.bool,
-  autoTrim: React.PropTypes.bool,
-  inputType: React.PropTypes.string,
+  IECompatible: PropTypes.bool,
+  onBlur: PropTypes.func,
+  onFocus: PropTypes.func,
+  onKeyDown: PropTypes.func,
+  renderView: PropTypes.func,
+  validateOnBlur: PropTypes.bool,
+  autoTrim: PropTypes.bool,
+  inputType: PropTypes.string,
 });
 InputFormField.defaultProps = assign({}, FormField.defaultProps, {
   IECompatible: true,

diff --git a/tests/InputFormField.spec.jsx b/tests/InputFormField.spec.jsx
@@ -1,10 +1,13 @@
 import expect from 'expect.js';
 import React from 'react';
-import { mount } from 'enzyme';
+import Enzyme, { mount } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-15';
 import sinon from 'sinon';
 import InputFormField from '../src';
 import util from '../src/util';
 
+Enzyme.configure({ adapter: new Adapter() });
+
 const { LeftAddon, RightAddon, Count } = InputFormField;
 
 sinon.spy(InputFormField.prototype, 'handleFocus');
@@ -29,13 +32,13 @@ describe('InputFormField', () => {
     instance = mount(
       <InputFormField autoTrim standalone />,
     );
-    instance.find('.kuma-input').node.value = ' a b ';
+    instance.find('.kuma-input').instance().value = ' a b ';
     instance.find('.kuma-input').simulate('change');
     setTimeout(() => {
-      expect(instance.find('.kuma-input').node.value).to.be(' a b ');
+      expect(instance.find('.kuma-input').instance().value).to.be(' a b ');
     }, 400);
     setTimeout(() => {
-      expect(instance.find('.kuma-input').node.value).to.be('a b');
+      expect(instance.find('.kuma-input').instance().value).to.be('a b');
       done();
     }, 600);
   });
@@ -44,7 +47,7 @@ describe('InputFormField', () => {
     instance = mount(
       <InputFormField autoTrim standalone />,
     );
-    instance.find('.kuma-input').node.value = 'a';
+    instance.find('.kuma-input').instance().value = 'a';
     instance.find('.kuma-input').simulate('change');
     clearTimerSpy.reset();
     instance.unmount();
@@ -55,21 +58,21 @@ describe('InputFormField', () => {
     instance = mount(
       <InputFormField jsxdisabled standalone />,
     );
-    expect(instance.find('.kuma-input').node.disabled).to.be(true);
+    expect(instance.find('.kuma-input').instance().disabled).to.be(true);
   });
 
   it('inputType', () => {
     instance = mount(
       <InputFormField inputType="password" standalone />,
     );
-    expect(instance.find('.kuma-input').node.type).to.be('password');
+    expect(instance.find('.kuma-input').instance().type).to.be('password');
   });
 
   it('IECompatible', () => {
     instance = mount(
       <InputFormField jsxplaceholder="test" IECompatible={false} standalone />,
     );
-    expect(instance.find('.kuma-input').node.placeholder).to.be('test');
+    expect(instance.find('.kuma-input').instance().placeholder).to.be('test');
   });
 
   it('handleFocus method', () => {