Skip to content

Commit aae6a1f

Browse files
levithomasonlevithomason
committed
remove scryText, rename findText to assertText
1 parent dbe6f7c commit aae6a1f

11 files changed

Lines changed: 56 additions & 130 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
_builds/
77
_projects/
88
_steps/
9-
npm-debug.log
9+
npm-debug.log*
1010
node_modules/
1111
bower_components/
1212
testBundle.js

‎src/collections/Menu/Menu.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, {Component, PropTypes} from 'react';
22
import classNames from 'classnames';
33
import META from 'src/utils/Meta';
4+
import getUnhandledProps from 'src/utils/getUnhandledProps';
45

56
export default class Menu extends Component {
67
static propTypes = {
@@ -38,8 +39,9 @@ export default class Menu extends Component {
3839
callbackParent: this.handleClickItem,
3940
});
4041
});
42+
const props = getUnhandledProps(this);
4143
return (
42-
<div {...this.props} className={classes}>
44+
<div {...props} className={classes}>
4345
{children}
4446
</div>
4547
);

‎test/specs/collections/Form/Field-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('Field', () => {
1212

1313
it('renders children', () => {
1414
render(<Field label='First Name'>yo child</Field>)
15-
.findText('yo child');
15+
.assertText('yo child');
1616
});
1717

1818
it('can specify a width', () => {

‎test/specs/collections/Grid/Grid-test.js‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,8 @@
1-
import _ from 'lodash';
21
import React from 'react';
3-
import faker from 'faker';
42
import {Grid} from 'stardust';
53

64
describe('Grid', () => {
7-
it('is an sd-grid', () => {
8-
const gridClassName = render(<Grid />).findClass('sd-grid').props.className;
9-
gridClassName.should.contain('sd-grid');
10-
const nodeClass = render(<Grid />).findClass('sd-grid').getDOMNode().getAttribute('class');
11-
nodeClass.should.contain('sd-grid');
12-
});
13-
14-
it('inherits classes', () => {
15-
// generate crap classes like "system firewall protocol"
16-
const classes = _.times(_.random(3), faker.hacker.noun).join(' ');
17-
18-
const renderedGridClasses = render(<Grid className={classes} />)
19-
.findClass('sd-grid')
20-
.getDOMNode()
21-
.getAttribute('class');
22-
renderedGridClasses.should.contain(classes);
23-
});
24-
25-
it('inherits style', () => {
26-
const style = {display: 'block'};
27-
render(<Grid style={style} />).findClass('sd-grid').props.style.should.deep.equal(style);
28-
});
29-
305
it('renders its children', () => {
316
render(<Grid><br /></Grid>).findClass('sd-grid').props.children.type.should.equal('br');
327
});
33-
34-
it('text example', () => {
35-
render(
36-
<Grid>
37-
root
38-
<div>div1</div>
39-
<div>div2</div>
40-
after
41-
<div className='nested'>
42-
child div
43-
<div>nested child div</div>
44-
</div>
45-
</Grid>
46-
)
47-
.findText('root');
48-
});
498
});

‎test/specs/collections/Menu/Menu-test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ describe('MenuItem', () => {
5353
it('should have active class after click', () => {
5454
const renderedMenuItems = render(
5555
<Menu>
56-
<MenuItem name='item1' />
57-
<MenuItem name='item2' />
56+
<MenuItem name='item1' className='firstItem' />
57+
<MenuItem name='item2' className='secondItem'/>
5858
</Menu>
5959
);
60-
const firstItem = renderedMenuItems.findText('item1');
61-
const secondItem = renderedMenuItems.findText('item2');
60+
const firstItem = renderedMenuItems.findClass('firstItem');
61+
const secondItem = renderedMenuItems.findClass('secondItem');
6262
const secondNode = secondItem.getDOMNode();
6363
Simulate.click(secondNode);
6464
firstItem.props.className.should.not.contain('active');

‎test/specs/collections/Message/Message-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('Message', () => {
1010
const message = render(<Message header={header} />);
1111

1212
message.findClass('sd-message-header');
13-
message.findText(header);
13+
message.assertText(header);
1414
});
1515
});
1616
describe('without header', () => {

‎test/specs/elements/Button/Button-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Button', () => {
1111
.should.equal('button');
1212
});
1313
it('renders "Click Here" by default', () => {
14-
render(<Button />).findText('Click Here');
14+
render(<Button />).assertText('Click Here');
1515
});
1616
it('has type of submit', () => {
1717
render(<Button type='submit' />)
@@ -20,7 +20,7 @@ describe('Button', () => {
2020
.should.equal('submit');
2121
});
2222
it('renders its children', () => {
23-
render(<Button>Save Now</Button>).findText('Save Now');
23+
render(<Button>Save Now</Button>).assertText('Save Now');
2424
});
2525
it('should run passed in handleClick function', () => {
2626
const handleClick = sandbox.spy();

‎test/specs/elements/Segment/Segment-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ describe('Segment', () => {
1717
it('has a heading', () => {
1818
const segment = render(<Segment heading='This is a segment' />);
1919
segment.findClass('sd-segment-heading');
20-
segment.findText('This is a segment');
20+
segment.assertText('This is a segment');
2121
});
2222
it('renders its children', () => {
2323
render(<Segment>Some text</Segment>)
24-
.findText('Some text');
24+
.assertText('Some text');
2525
});
2626
});

‎test/specs/modules/Modal/Modal-test.js‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,39 @@
1-
import _ from 'lodash';
21
import React from 'react';
3-
import faker from 'faker';
42
import {Modal, ModalHeader, ModalContent, ModalFooter} from 'stardust';
53

64
describe('Modal', () => {
75
it('should default ref to be "modal"', () => {
8-
const modal = render(<Modal />).first();
9-
modal.props.ref.should.equal('modal');
6+
Modal.defaultProps.ref.should.equal('modal');
107
});
118
it('should initially have a state where `isShown` is false', () => {
129
render(<Modal />).first().state.isShown.should.equal(false);
1310
});
1411
it('should render children', () => {
15-
render(<Modal>Hello</Modal>).findText('Hello');
16-
});
17-
it('inherits classes', () => {
18-
// generate crap classes like "system firewall protocol"
19-
const classes = _.times(_.random(3), faker.hacker.noun).join(' ');
20-
const renderedGridClasses = render(<Modal className={classes} />).findClass('sd-modal');
21-
renderedGridClasses.props.className.should.contain(classes);
12+
render(<Modal>Hello</Modal>).assertText('Hello');
2213
});
2314
it('sets isShown true', () => {
24-
const renderedModal = render(<Modal />).first();
25-
renderedModal.showModal();
26-
renderedModal.state.isShown.should.equal(true);
15+
const modal = render(<Modal />).first();
16+
modal.showModal();
17+
modal.state.isShown.should.equal(true);
2718
});
2819
it('sets isShown false', () => {
29-
const renderedModal = render(<Modal />).first();
30-
renderedModal.hideModal();
31-
renderedModal.state.isShown.should.equal(false);
20+
const modal = render(<Modal />).first();
21+
modal.hideModal();
22+
modal.state.isShown.should.equal(false);
3223
});
3324
describe('ModalHeader', () => {
3425
it('should render children', () => {
35-
render(<Modal><ModalHeader>Hello</ModalHeader></Modal>).findText('Hello');
36-
});
37-
it('inherits classes', () => {
38-
const classes = _.times(_.random(3), faker.hacker.noun).join(' ');
39-
const renderedGridClasses = render(<ModalHeader className={classes} />).findClass('sd-modal-header');
40-
renderedGridClasses.props.className.should.contain(classes);
26+
render(<ModalHeader>Hello</ModalHeader>).assertText('Hello');
4127
});
4228
});
4329
describe('ModalContent', () => {
4430
it('should render children', () => {
45-
render(<Modal><ModalContent>Hello</ModalContent></Modal>).findText('Hello');
46-
});
47-
it('inherits classes', () => {
48-
const classes = _.times(_.random(3), faker.hacker.noun).join(' ');
49-
const renderedGridClasses = render(<ModalContent className={classes} />).findClass('sd-modal-content');
50-
renderedGridClasses.props.className.should.contain(classes);
31+
render(<ModalContent>Hello</ModalContent>).assertText('Hello');
5132
});
5233
});
5334
describe('ModalFooter', () => {
5435
it('should render children', () => {
55-
render(<Modal><ModalFooter>Hey You</ModalFooter></Modal>).findText('Hey You');
56-
});
57-
it('inherits classes', () => {
58-
const classes = _.times(_.random(3), faker.hacker.noun).join(' ');
59-
const renderedGridClasses = render(<ModalFooter className={classes} />).findClass('sd-modal-footer');
60-
renderedGridClasses.props.className.should.contain(classes);
36+
render(<ModalFooter>Hey You</ModalFooter>).assertText('Hey You');
6137
});
6238
});
6339
});

‎test/specs/views/Items/Item-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import faker from 'faker';
55
describe('Item', () => {
66
it('renders children', () => {
77
const child = faker.hacker.phrase();
8-
render(<Item>{child}</Item>).findText(child);
8+
render(<Item>{child}</Item>).assertText(child);
99
});
1010
});

0 commit comments

Comments
 (0)