Skip to content

Commit a93ee40

Browse files
jquensejquense
committed
fix tests!
1 parent 8a102c7 commit a93ee40

21 files changed

+370
-382
lines changed

‎package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@
4747
"dependencies": {
4848
"classnames": "^2.1.2",
4949
"date-arithmetic": "^3.0.0",
50-
"dom-helpers": "^1.3.2",
50+
"dom-helpers": "^2.2.4",
5151
"globalize": "~0.1.1",
52-
"uncontrollable": "^3.0.0"
52+
"invariant": "^2.1.0",
53+
"uncontrollable": "^3.0.2",
54+
"warning": "^2.0.0"
5355
},
5456
"devDependencies": {
5557
"babel-core": "^5.8.21",
@@ -73,7 +75,7 @@
7375
"imports-loader": "^0.6.3",
7476
"jq-release": "*",
7577
"json-loader": "^0.5.2",
76-
"karma": "^0.12.37",
78+
"karma": "~0.13.3",
7779
"karma-chrome-launcher": "^0.2.0",
7880
"karma-expect": "~1.1.0",
7981
"karma-firefox-launcher": "^0.1.3",
@@ -82,7 +84,7 @@
8284
"karma-phantomjs-launcher": "^0.2.1",
8385
"karma-sauce-launcher": "^0.2.14",
8486
"karma-sourcemap-loader": "^0.3.5",
85-
"karma-webpack": "^1.5.1",
87+
"karma-webpack": "^1.7.0",
8688
"less": "^2.5.1",
8789
"less-loader": "^2.2.0",
8890
"marked": "^0.3.5",
@@ -99,7 +101,7 @@
99101
"scriptjs": "^2.5.7",
100102
"style-loader": "^0.12.3",
101103
"url-loader": "^0.5.5",
102-
"webpack": "^1.11.0",
104+
"webpack": "^1.10.5",
103105
"webpack-dev-server": "^1.10.1"
104106
}
105107
}

‎src/DateTimePicker.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import invariant from 'react/lib/invariant';
3-
import activeElement from 'react/lib/getActiveElement';
2+
import invariant from 'invariant';
3+
import activeElement from 'dom-helpers/activeElement';
44
import cx from 'classnames';
55
import compat from './util/compat';
66
import _ from './util/_'; //pick, omit, has

‎src/DropdownList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import activeElement from 'react/lib/getActiveElement';
2+
import activeElement from 'dom-helpers/activeElement';
33
import contains from'dom-helpers/query/contains';
44
import cx from 'classnames';
55
import _ from './util/_';

‎src/ListGroupable.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import CustomPropTypes from './util/propTypes';
44
import compat from './util/compat';
55
import cn from 'classnames';
66
import _ from './util/_';
7-
import warning from 'react/lib/warning';
7+
import warning from 'warning';
88
import { dataText, dataValue } from './util/dataHelpers';
99
import { instanceId, notify } from './util/widgetHelpers';
1010

‎src/MultiselectTagList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export default React.createClass({
8686
}
8787
<span
8888
tabIndex='-1'
89-
onClick={!(isDisabled || isReadonly) && this._delete.bind(null, item)}
89+
onClick={!(isDisabled || isReadonly) ? this._delete.bind(null, item) : undefined}
9090
aria-disabled={isDisabled}
9191
aria-label='Unselect'
9292
disabled={isDisabled}

‎src/configure.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var warning = require('react/lib/warning')
1+
var warning = require('warning')
22
, configuration = require('./util/configuration')
33
, {
44
NumberLocalizer

‎src/mixins/AriaDescendantMixin.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
import React from 'react';
3+
import compat from '../util/compat';
34

45
let shape = React.PropTypes.shape({
56
//setActive: React.PropTypes.func,
@@ -19,9 +20,9 @@ function flushAriaToNode(id, nodeOrComponent, ctx) {
1920

2021
if (node) {
2122
if (id)
22-
React.findDOMNode(node).setAttribute('aria-activedescendant', id)
23+
compat.findDOMNode(node).setAttribute('aria-activedescendant', id)
2324
else
24-
React.findDOMNode(node).removeAttribute('aria-activedescendant')
25+
compat.findDOMNode(node).removeAttribute('aria-activedescendant')
2526
}
2627
}
2728

‎src/mixins/DataHelpersMixin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22
import React from 'react';
3-
import warning from'react/lib/warning';
3+
import warning from 'warning';
44
import propTypes from '../util/propTypes';
55
import * as dataHelpers from '../util/dataHelpers';
66

‎src/util/compat.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
2-
var React = require('react')
3-
, _ = require('./_')
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
3+
import _ from './_';
44

55
var version = React.version.split('.').map(parseFloat);
66

@@ -18,18 +18,15 @@ module.exports = {
1818
},
1919

2020
findDOMNode(component){
21-
if( React.findDOMNode )
22-
return React.findDOMNode(component)
23-
24-
return component.getDOMNode()
21+
return ReactDOM.findDOMNode(component)
2522
},
2623

2724
cloneElement(child, props){
2825
if ( React.cloneElement )
2926
return React.cloneElement(child, props)
3027

3128
//just mutate if pre 0.13
32-
_.each(props,
29+
_.each(props,
3330
(value, prop) => child.props[prop] = value)
3431

3532
return child

‎src/util/localizers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var invariant = require('react/lib/invariant')
1+
var invariant = require('invariant')
22
var { has } = require('./_')
33
var React = require('react')
44

‎src/util/propTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
'Invalid prop `' + propName + '` specified in `' + componentName + '`.' +
3232
' Expected an Element `type` such as a tag name or return value of React.createClass(...)')
3333
}
34-
return true
34+
return null
3535
}),
3636

3737
numberFormat: createChainableTypeChecker(

‎test/calendar.browser.jsx

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
/*global it, describe, expect, sinon, $*/
33
require('../vendor/phantomjs-shim')
44

5+
import ReactDOM from 'react-dom';
6+
57
var React = require('react/addons')
68
, Calendar = require('../src/Calendar.jsx')
79
, BaseCalendar = require('../src/Calendar.jsx').BaseCalendar
@@ -30,7 +32,7 @@ var TestUtils = React.addons.TestUtils
3032
describe('Calendar', () => {
3133

3234
afterEach(()=> {
33-
config.animate.restore &&
35+
config.animate.restore &&
3436
config.animate.restore()
3537
})
3638

@@ -39,32 +41,32 @@ describe('Calendar', () => {
3941
var date = new Date()
4042
, picker = render(<Calendar defaultValue={date} initialView='year'/>);
4143

42-
expect(() =>
44+
expect(() =>
4345
findType(picker, require('../src/Year.jsx'))).to.not.throwException();
4446
})
4547

4648
it('should click up through views', function(){
4749
var date = new Date()
4850
, picker = render(<Calendar defaultValue={date} />)
4951
, header = findType(picker, Header)
50-
, navBtn = findClass(header, 'rw-btn-view').getDOMNode();
52+
, navBtn = findClass(header, 'rw-btn-view');
5153

52-
expect(() =>
54+
expect(() =>
5355
findType(picker, Month)).to.not.throwException();
5456

5557
trigger.click(navBtn)
5658

57-
expect(() =>
59+
expect(() =>
5860
findType(picker, Year)).to.not.throwException();
5961

6062
trigger.click(navBtn)
6163

62-
expect(() =>
64+
expect(() =>
6365
findType(picker, Decade)).to.not.throwException();
6466

6567
trigger.click(navBtn)
6668

67-
expect(() =>
69+
expect(() =>
6870
findType(picker, Century)).to.not.throwException();
6971

7072
expect(navBtn.hasAttribute('disabled')).to.be(true)
@@ -74,22 +76,22 @@ describe('Calendar', () => {
7476
var date = new Date()
7577
, picker = render(<Calendar defaultValue={date} />);
7678

77-
expect(() =>
79+
expect(() =>
7880
findType(picker, Month)).to.not.throwException();
7981

80-
trigger.keyDown(picker.getDOMNode(), { ctrlKey: true, key: 'ArrowUp' })
82+
trigger.keyDown(ReactDOM.findDOMNode(picker), { ctrlKey: true, key: 'ArrowUp' })
8183

82-
expect(() =>
84+
expect(() =>
8385
findType(picker, Year)).to.not.throwException();
8486

85-
trigger.keyDown(picker.getDOMNode(), { ctrlKey: true, key: 'ArrowUp' })
87+
trigger.keyDown(ReactDOM.findDOMNode(picker), { ctrlKey: true, key: 'ArrowUp' })
8688

87-
expect(() =>
89+
expect(() =>
8890
findType(picker, Decade)).to.not.throwException();
8991

90-
trigger.keyDown(picker.getDOMNode(), { ctrlKey: true, key: 'ArrowUp' })
92+
trigger.keyDown(ReactDOM.findDOMNode(picker), { ctrlKey: true, key: 'ArrowUp' })
9193

92-
expect(() =>
94+
expect(() =>
9395
findType(picker, Century)).to.not.throwException();
9496

9597
})
@@ -98,8 +100,8 @@ describe('Calendar', () => {
98100
var date = new Date(2014, 5, 15, 0, 0, 0)
99101
, picker = render(<Calendar defaultValue={date} />)
100102
, header = findType(picker, Header)
101-
, leftBtn = findClass(header, 'rw-btn-left').getDOMNode()
102-
, navBtn = findClass(header, 'rw-btn-view').getDOMNode();
103+
, leftBtn = findClass(header, 'rw-btn-left')
104+
, navBtn = findClass(header, 'rw-btn-view');
103105

104106
syncAnimate()
105107

@@ -127,8 +129,8 @@ describe('Calendar', () => {
127129
var date = new Date(2014, 5, 15, 0, 0, 0)
128130
, picker = render(<Calendar defaultValue={date} max={new Date(2199,11, 31)} />)
129131
, header = findType(picker, Header)
130-
, rightBtn = findClass(header, 'rw-btn-right').getDOMNode()
131-
, navBtn = findClass(header, 'rw-btn-view').getDOMNode();
132+
, rightBtn = findClass(header, 'rw-btn-right')
133+
, navBtn = findClass(header, 'rw-btn-view');
132134

133135
syncAnimate()
134136

@@ -164,7 +166,7 @@ describe('Calendar', () => {
164166
expect(() => footer = findType(picker, Footer))
165167
.to.not.throwException()
166168

167-
expect($(footer.getDOMNode()).text())
169+
expect($(ReactDOM.findDOMNode(footer)).text())
168170
.to.equal(
169171
globalize.format(new Date, 'D'))
170172
})
@@ -179,7 +181,7 @@ describe('Calendar', () => {
179181
var picker = render(<BaseCalendar footer footerFormat={formatter} culture='en'/>)
180182
, footer = findType(picker, Footer);
181183

182-
expect($(footer.getDOMNode()).text())
184+
expect($(ReactDOM.findDOMNode(footer)).text())
183185
.to.equal('test')
184186

185187
expect(formatter.calledOnce).to.be.ok()
@@ -190,7 +192,7 @@ describe('Calendar', () => {
190192
, footer = findType(picker, Footer);
191193

192194
trigger.click(
193-
findClass(footer, 'rw-btn').getDOMNode())
195+
findClass(footer, 'rw-btn'))
194196

195197
expect(
196198
dates.eq(picker.state.currentDate, new Date(), 'day'))
@@ -201,8 +203,8 @@ describe('Calendar', () => {
201203
var date = new Date(2014, 5, 15)
202204
, picker = render(<BaseCalendar value={date} max={new Date(2014, 5, 25)} min={new Date(2014, 5, 5)} onChange={()=>{}}/>)
203205
, header = findType(picker, Header)
204-
, rightBtn = findClass(header, 'rw-btn-right').getDOMNode()
205-
, leftBtn = findClass(header, 'rw-btn-left').getDOMNode();
206+
, rightBtn = findClass(header, 'rw-btn-right')
207+
, leftBtn = findClass(header, 'rw-btn-left');
206208

207209
trigger.click(rightBtn)
208210

@@ -219,50 +221,49 @@ describe('Calendar', () => {
219221

220222
var date = new Date(2014, 5, 15)
221223
, picker = render(<BaseCalendar value={date} culture='es' onChange={()=>{}}/>)
222-
, headerBtn = findClass(picker, 'rw-btn-view').getDOMNode()
223-
, head = findTag(picker, 'thead').getDOMNode();
224-
224+
, headerBtn = findClass(picker, 'rw-btn-view')
225+
, head = findTag(picker, 'thead');
226+
225227
syncAnimate()
226228

227229
expect($(headerBtn).text()).to.equal('junio 2014')
228230
expect($(head.children[0].firstChild).text()).to.equal('lu')
229231

230-
picker.setProps({ initialView: 'year' })
232+
picker = render(<BaseCalendar initialView='year' value={date} culture='es' onChange={()=>{}}/>)
231233

232-
expect($(findTag(picker, 'tbody').getDOMNode().children[0].firstChild).text())
234+
expect($(findTag(picker, 'tbody').children[0].firstChild).text())
233235
.to.equal('ene')
234236
})
235237

236238
it('should pass on format', function(){
237239
var date = new Date(2014, 5, 15)
238-
, first = () => $(calendar.getDOMNode()).find('td:first')
239240
, formats = transform(
240241
['dayFormat', 'dateFormat', 'monthFormat', 'yearFormat', 'decadeFormat' ]
241242
, (o, v) => o[v] = v)
242243
, calendar;
243-
244+
244245
syncAnimate()
245246

246247
calendar = render(<BaseCalendar {...formats} value={date} onChange={()=>{}} />)
247248

248249
expect(findType(calendar, Month).props.dayFormat).to.equal('dayFormat')
249250
expect(findType(calendar, Month).props.dateFormat).to.equal('dateFormat')
250251

251-
calendar.setProps({ initialView: 'year' })
252+
calendar = render(<BaseCalendar {...formats} initialView='year' value={date} onChange={()=>{}} />)
252253

253254
expect(findType(calendar, Year).props.monthFormat).to.equal('monthFormat')
254255

255-
calendar.setProps({ initialView: 'decade' })
256+
calendar = render(<BaseCalendar {...formats} initialView='decade' value={date} onChange={()=>{}} />)
256257

257258
expect(findType(calendar, Decade).props.yearFormat).to.equal('yearFormat')
258259

259-
calendar.setProps({ initialView: 'century' })
260+
calendar = render(<BaseCalendar {...formats} initialView='century' value={date} onChange={()=>{}} />)
260261

261262
expect(findType(calendar, Century).props.decadeFormat).to.equal('decadeFormat')
262263
})
263264

264265
describe('Date Helpers', () => {
265-
266+
266267
it('should move to the proper day', function(){
267268
var date = new Date(2014, 0, 16, 0, 0, 0)
268269
, min, max;

0 commit comments

Comments
 (0)