uxcore · eternalsky · Sep 30, 2017 · Sep 30, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,17 @@ language: node_js
 
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - xvfb
+
 notification:
   email:
     - wsj7552715@hotmail.com
 
 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/demo/Select2Demo.jsx b/demo/Select2Demo.jsx
@@ -111,7 +111,7 @@ class Demo extends React.Component {
             size={this.state.size}
             allowClear
             value={this.state.size}
-            style={{ width: 200 }}
+            style={{ width: '200px' }}
             onChange={(size) => { this.setState({ size }); }}
           >
             <Option value="large">large</Option>
@@ -123,12 +123,13 @@ class Demo extends React.Component {
             size={this.state.size}
             placeholder="请选择"
             notFoundContent=""
-            style={{ width: 200 }}
+            style={{ width: '200px' }}
             onChange={me.handleChange.bind(me)}
             allowClear
             getPopupContainer={function () {
               return document.getElementById('container');
-            }} dropdownClassName="kuma-select2-selected-has-icon"
+            }}
+            dropdownClassName="kuma-select2-selected-has-icon"
           >
             <Option value="jack">Jack</Option>
             <Option value="lucy">LucyLucyLucyLucyLucyLucyLucyLucy</Option>
@@ -137,7 +138,12 @@ class Demo extends React.Component {
           </Select>
           <p>带搜索框:</p>
           <Select
-            size={this.state.size} defaultValue="lucy" showSearch style={{ width: 200 }} searchPlaceholder="输入" onChange={me.handleChange.bind(me)}
+            size={this.state.size}
+            defaultValue="lucy"
+            showSearch
+            style={{ width: '200px' }}
+            searchPlaceholder="输入"
+            onChange={me.handleChange.bind(me)}
           >
             <Option value="jack">jack</Option>
             <Option value="lucy">lucy</Option>
@@ -146,7 +152,13 @@ class Demo extends React.Component {
           </Select>
           <p>多选:</p>
           <Select
-            size={this.state.size} multiple style={{ width: 400 }} defaultValue={['a10', 'c12']} placeholder="输入" onChange={me.handleChange.bind(me)} allowClear
+            size={this.state.size}
+            multiple
+            style={{ width: '400px' }}
+            defaultValue={['a10', 'c12']}
+            placeholder="输入"
+            onChange={me.handleChange.bind(me)}
+            allowClear
           >
             {children}
           </Select>
@@ -155,23 +167,27 @@ class Demo extends React.Component {
             size={this.state.size}
             multiple
             filterOption={false}
-            style={{ width: 400 }}
+            style={{ width: '400px' }}
             onSearch={me.handleSearch.bind(me)}
             onChange={me.handleChange.bind(me)}
           >
             {ajaxOptions}
           </Select>
           <p>标签:(标签的意义是，用户可以通过键盘自己输入值，而不局限于传入的选项)</p>
           <Select
-            size={this.state.size} style={{ width: '100%' }} searchPlaceholder="标签模式" tags onChange={me.handleChange.bind(me)}
+            size={this.state.size}
+            style={{ width: '100%' }}
+            searchPlaceholder="标签模式"
+            tags
+            onChange={me.handleChange.bind(me)}
           >
             {tagChildren}
           </Select>
           <p>智能提示</p>
           <Select
             size={this.state.size}
             combobox
-            style={{ width: 200 }}
+            style={{ width: '200px' }}
             onChange={this.handleMailChange.bind(this)}
             filterOption={false}
             searchPlaceholder="请输入账户名"
@@ -182,7 +198,7 @@ class Demo extends React.Component {
           <Select
             size={this.state.size}
             defaultValue={provinceData[0]}
-            style={{ width: 150 }}
+            style={{ width: '150px' }}
             onChange={this.handleProvinceChange.bind(this)}
           >
             {provinceOptions}
@@ -191,20 +207,24 @@ class Demo extends React.Component {
           <Select
             size={this.state.size}
             value={this.state.secondCity}
-            style={{ width: 150 }}
+            style={{ width: '150px' }}
             onChange={this.onSecondCityChange.bind(this)}
           >
             {cityOptions}
           </Select>
           <p>Combo 模式</p>
           <Select
-            size={this.state.size} combobox
+            size={this.state.size}
+            combobox
           >
             {cityOptions}
           </Select>
           <p>禁用</p>
           <Select
-            size={this.state.size} defaultValue="lucy" style={{ width: 200 }} disabled
+            size={this.state.size}
+            defaultValue="lucy"
+            style={{ width: '200px' }}
+            disabled
           >
             <Option value="jack">Jack</Option>
             <Option value="lucy">Lucy</Option>

diff --git a/package.json b/package.json
@@ -1,51 +1,54 @@
 {
- "name": "uxcore-select2",
- "version": "0.4.19",
- "description": "select ui component for react",
- "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"
- },
- "repository": "https://github.com/uxcore/uxcore-select2.git",
- "bugs": {
-  "url": "http://github.com/uxcore/select/issues"
- },
- "keywords": [
-  "react",
-  "react-pagination",
-  "react-select",
-  "select"
- ],
- "devDependencies": {
-  "console-polyfill": "^0.2.2",
-  "enzyme": "^2.7.0",
-  "es5-shim": "^4.5.8",
-  "expect.js": "~0.3.1",
-  "jquery": "^1.12.4",
-  "kuma-base": "1.x",
-  "react": "0.14.x",
-  "react-addons-test-utils": "0.14.x",
-  "react-dom": "0.14.x",
-  "uxcore-kuma": "*",
-  "uxcore-tools": "0.2.x"
- },
- "dependencies": {
-  "classnames": "^2.1.2",
-  "rc-select": "~6.8.0"
- },
- "author": "",
- "contributors": [],
- "license": "MIT"
-}
+  "name": "uxcore-select2",
+  "version": "0.4.19",
+  "description": "select ui component for react",
+  "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"
+  },
+  "repository": "https://github.com/uxcore/uxcore-select2.git",
+  "bugs": {
+    "url": "http://github.com/uxcore/select/issues"
+  },
+  "keywords": [
+    "react",
+    "react-pagination",
+    "react-select",
+    "select"
+  ],
+  "devDependencies": {
+    "console-polyfill": "^0.2.3",
+    "enzyme": "^3.0.0",
+    "enzyme-adapter-react-15": "^1.0.0",
+    "es5-shim": "^4.5.9",
+    "expect.js": "^0.3.1",
+    "jquery": "^1.12.4",
+    "kuma-base": "^1.7.2",
+    "react": "^15.6.2",
+    "react-dom": "^15.6.2",
+    "react-test-renderer": "^15.6.2",
+    "uxcore-kuma": "^8.1.1",
+    "uxcore-tools": "0.2.x"
+  },
+  "dependencies": {
+    "classnames": "^2.2.5",
+    "prop-types": "^15.6.0",
+    "rc-select": "^6.9.3"
+  },
+  "author": "",
+  "contributors": [],
+  "license": "MIT"
+}
diff --git a/src/Select2.jsx b/src/Select2.jsx
@@ -1,6 +1,7 @@
 import RcSelect from 'rc-select';
 import classnames from 'classnames';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 
 class Select2 extends React.Component {
@@ -19,7 +20,7 @@ class Select2 extends React.Component {
 }
 Select2.displayName = 'Select2';
 Select2.propTypes = {
-  size: React.PropTypes.oneOf(['large', 'middle', 'small']),
+  size: PropTypes.oneOf(['large', 'middle', 'small']),
 };
 Select2.defaultProps = {
   size: 'large',

diff --git a/tests/Select2.spec.js b/tests/Select2.spec.js
@@ -1,13 +1,16 @@
 import expect from 'expect.js';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { mount } from 'enzyme';
-import TestUtils, { Simulate } from 'react-addons-test-utils';
+import Enzyme, { mount } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-15';
+import TestUtils, { Simulate } from 'react-dom/test-utils';
 import Select2 from '../src';
 
+Enzyme.configure({ adapter: new Adapter() });
+
 describe('Select2', () => {
   it('allows us to set props', () => {
-    const wrapper = mount(<Select2 prefixCls="kuma-select2" optionLabelProp="children" transitionName="slideUp" ></Select2>);
+    const wrapper = mount(<Select2 prefixCls="kuma-select2" optionLabelProp="children" transitionName="slideUp" />);
     expect(wrapper.props().prefixCls).to.equal('kuma-select2');
     wrapper.setProps({ prefixCls: 'kuma-select2-test' });
     expect(wrapper.props().prefixCls).to.equal('kuma-select2-test');
@@ -20,4 +23,4 @@ describe('Select2', () => {
     wrapper.setProps({ transitionName: 'slideUp-test' });
     expect(wrapper.props().transitionName).to.equal('slideUp-test');
   });
-});
+});
diff --git a/tests/index.js b/tests/index.js
@@ -2,5 +2,5 @@
  * only require other specs here
  */
 
- const req = require.context('.', false, /\.spec\.js(x)?$/);
- req.keys().forEach(req);
+const req = require.context('.', false, /\.spec\.js(x)?$/);
+req.keys().forEach(req);