Skip to content

Commit 333c663

Browse files
committed
Move and refactor CollapsableNavSpec
1 parent 626fefa commit 333c663

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

src/CollapsibleNav.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const CollapsibleNav = React.createClass({
110110
activeKey: this.props.activeKey,
111111
activeHref: this.props.activeHref,
112112
onSelect: createChainedFunction(child.props.onSelect, this.props.onSelect),
113-
ref: 'collapsable_' + key,
113+
ref: 'collapsible_' + key,
114114
key: key,
115115
navItem: true
116116
}
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import React from 'react';
22
import ReactTestUtils from 'react/lib/ReactTestUtils';
33
import Navbar from '../src/Navbar';
4-
import CollapsableNav from '../src/CollapsableNav';
4+
import CollapsibleNav from '../src/CollapsibleNav';
55
import Nav from '../src/Nav';
66
import NavItem from '../src/NavItem';
77

8-
describe('CollapsableNav', function () {
8+
describe('CollapsibleNav', function () {
99
it('Should create div and add collapse class', function () {
1010
let Parent = React.createClass({
1111
render: function() {
1212
return (
1313
<Navbar toggleNavKey={1}>
14-
<CollapsableNav eventKey={1}>
14+
<CollapsibleNav eventKey={1}>
1515
<Nav>
1616
<NavItem eventKey={1} ref='item1'>Item 1 content</NavItem>
1717
<NavItem eventKey={2} ref='item2'>Item 2 content</NavItem>
1818
</Nav>
19-
</CollapsableNav>
19+
</CollapsibleNav>
2020
</Navbar>
2121
);
2222
}
@@ -30,7 +30,7 @@ describe('CollapsableNav', function () {
3030
render: function() {
3131
return (
3232
<Navbar toggleNavKey={1}>
33-
<CollapsableNav eventKey={1} ref='collapsable_object'>
33+
<CollapsibleNav eventKey={1} ref='collapsible_object'>
3434
<Nav>
3535
<NavItem eventKey={1} ref='item1'>Item 1 content</NavItem>
3636
<NavItem eventKey={2} ref='item2'>Item 2 content</NavItem>
@@ -39,33 +39,33 @@ describe('CollapsableNav', function () {
3939
<NavItem eventKey={1} ref='item1'>Item 1 content</NavItem>
4040
<NavItem eventKey={2} ref='item2'>Item 2 content</NavItem>
4141
</Nav>
42-
</CollapsableNav>
42+
</CollapsibleNav>
4343
</Navbar>
4444
);
4545
}
4646
});
4747
let instance = ReactTestUtils.renderIntoDocument(<Parent />);
48-
assert.ok(ReactTestUtils.findRenderedComponentWithType(instance.refs.collapsable_object.refs.collapsable_0, Nav));
49-
assert.ok(ReactTestUtils.findRenderedComponentWithType(instance.refs.collapsable_object.refs.collapsable_1, Nav));
48+
assert.ok(ReactTestUtils.findRenderedComponentWithType(instance.refs.collapsible_object.refs.collapsible_0, Nav));
49+
assert.ok(ReactTestUtils.findRenderedComponentWithType(instance.refs.collapsible_object.refs.collapsible_1, Nav));
5050
});
5151

5252
it('Should just render children and move along if not in <Navbar>', function () {
5353
let Parent = React.createClass({
5454
render: function() {
5555
return (
56-
<CollapsableNav eventKey={1}>
56+
<CollapsibleNav eventKey={1}>
5757
<Nav>
5858
<NavItem eventKey={1} ref='item1'>Item 1 content</NavItem>
5959
<NavItem eventKey={2} ref='item2'>Item 2 content</NavItem>
6060
</Nav>
61-
</CollapsableNav>
61+
</CollapsibleNav>
6262
);
6363
}
6464
});
6565
let instance = ReactTestUtils.renderIntoDocument(<Parent />);
66-
let collapsableNav = ReactTestUtils.findRenderedComponentWithType(instance, CollapsableNav);
67-
assert.notOk(collapsableNav.getDOMNode().className.match(/\navbar-collapse\b/));
68-
let nav = ReactTestUtils.findRenderedComponentWithType(collapsableNav.refs.nocollapse_0, Nav);
66+
let collapsibleNav = ReactTestUtils.findRenderedComponentWithType(instance, CollapsibleNav);
67+
assert.notOk(collapsibleNav.getDOMNode().className.match(/\navbar-collapse\b/));
68+
let nav = ReactTestUtils.findRenderedComponentWithType(collapsibleNav.refs.nocollapse_0, Nav);
6969
assert.ok(nav);
7070
});
7171

@@ -74,39 +74,39 @@ describe('CollapsableNav', function () {
7474
render: function() {
7575
return (
7676
<Navbar toggleNavKey={1}>
77-
<CollapsableNav eventKey={1} ref='collapsable_object'>
77+
<CollapsibleNav eventKey={1} ref='collapsible_object'>
7878
<Nav>
7979
<NavItem eventKey={1} ref='item1' className='foo bar'>Item 1 content</NavItem>
8080
<NavItem eventKey={2} ref='item2' className='baz'>Item 2 content</NavItem>
8181
</Nav>
82-
</CollapsableNav>
82+
</CollapsibleNav>
8383
</Navbar>
8484
);
8585
}
8686
});
8787
let instance = ReactTestUtils.renderIntoDocument(<Parent />);
88-
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsable_object.refs.collapsable_0, 'foo'));
89-
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsable_object.refs.collapsable_0, 'bar'));
90-
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsable_object.refs.collapsable_0, 'baz'));
88+
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsible_object.refs.collapsible_0, 'foo'));
89+
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsible_object.refs.collapsible_0, 'bar'));
90+
assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance.refs.collapsible_object.refs.collapsible_0, 'baz'));
9191
});
9292

9393
it('Should should not duplicate classes', function () {
9494
let Parent = React.createClass({
9595
render: function() {
9696
return (
9797
<Navbar toggleNavKey={1}>
98-
<CollapsableNav eventKey={1} ref='collapsable_object' className='foo navbar-collapse'>
98+
<CollapsibleNav eventKey={1} ref='collapsible_object' className='foo navbar-collapse'>
9999
<Nav>
100100
<NavItem eventKey={1} ref='item1' className='foo bar'>Item 1 content</NavItem>
101101
<NavItem eventKey={2} ref='item2' className='baz'>Item 2 content</NavItem>
102102
</Nav>
103-
</CollapsableNav>
103+
</CollapsibleNav>
104104
</Navbar>
105105
);
106106
}
107107
});
108108
let instance = ReactTestUtils.renderIntoDocument(<Parent />);
109-
let classDOM = ReactTestUtils.findRenderedDOMComponentWithTag(instance.refs.collapsable_object, 'DIV').props.className
109+
let classDOM = ReactTestUtils.findRenderedDOMComponentWithTag(instance.refs.collapsible_object, 'DIV').props.className
110110
, classArray = classDOM.split(' ')
111111
, idx = classArray.indexOf('navbar-collapse');
112112
assert.equal(classArray.indexOf('navbar-collapse', idx+1), -1);

0 commit comments

Comments
 (0)