Skip to content

Commit db65265

Browse files
Merge pull request Hacker0x01#218 from rafeememon/bugfix/always-in-range
Read inRange from prop passed to Day
2 parents efa0e7f + cedb85b commit db65265

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

src/day.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var Day = React.createClass( {
2222
if ( this.props.day.sameDay( this.props.selected ) )
2323
classes.push( "datepicker__day--selected" );
2424

25-
if ( this.props.day.inRange )
25+
if ( this.props.inRange )
2626
classes.push( "datepicker__day--in-range" );
2727

2828
if ( this.props.day.sameDay( moment() ) )

test/day_test.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
var React = require( "react" );
2+
var ReactDOM = require( "react-dom" );
3+
var TestUtils = require( "react-addons-test-utils" );
4+
var moment = require( "moment" );
5+
var DateUtil = require( "../src/util/date" );
6+
var Day = require( "../src/day.jsx" );
7+
8+
describe( "Day", function() {
9+
it( "should apply the in-range class if in range", function() {
10+
var day = new DateUtil(moment());
11+
var dayComponent = TestUtils.renderIntoDocument(
12+
<Day
13+
day={day}
14+
selected={day}
15+
inRange={true} />
16+
);
17+
18+
expect( ReactDOM.findDOMNode( dayComponent ).className ).to.contain( "datepicker__day--in-range" );
19+
} );
20+
21+
it( "should not apply the in-range class if not in range", function() {
22+
var day = new DateUtil(moment());
23+
var dayComponent = TestUtils.renderIntoDocument(
24+
<Day
25+
day={day}
26+
selected={day}
27+
inRange={false} />
28+
);
29+
30+
expect( ReactDOM.findDOMNode( dayComponent ).className ).to.not.contain( "datepicker__day--in-range" );
31+
} );
32+
} );

0 commit comments

Comments
 (0)