Skip to content

Commit

Permalink
Enable no-unused-expressions ESLint rule
Browse files Browse the repository at this point in the history
This enables the `no-unused-expressions` ESLint rule and fixes the
corresponding violations. In fixing the errors I stumbled upon two
tests that were broken. After discussing with @lelandrichardson, I've
inverted the test case as the current behavior is the desired behavior.
  • Loading branch information
iancmyers committed Jan 7, 2016
1 parent bda5286 commit cb9419f
Show file tree
Hide file tree
Showing 29 changed files with 247 additions and 251 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('<MyComponent />', () => {
<div className="unique" />
</MyComponent>
);
expect(wrapper.contains(<div className="unique" />)).to.be.true;
expect(wrapper.contains(<div className="unique" />)).to.equal(true);
});

it('simulates click events', () => {
Expand All @@ -74,7 +74,7 @@ describe('<MyComponent />', () => {
<Foo onButtonClick={onButtonClick} />
);
wrapper.find('button').simulate('click');
expect(onButtonClick.calledOnce).to.be.true;
expect(onButtonClick.calledOnce).to.equal(true);
});

});
Expand All @@ -98,7 +98,7 @@ describeWithDOM('<Foo />', () => {
it('calls componentDidMount', () => {
spyLifecycle(Foo);
const wrapper = mount(<Foo />);
expect(Foo.prototype.componentDidMount.calledOnce).to.be.true;
expect(Foo.prototype.componentDidMount.calledOnce).to.equal(true);
});

it('allows us to set props', () => {
Expand All @@ -114,7 +114,7 @@ describeWithDOM('<Foo />', () => {
<Foo onButtonClick={onButtonClick} />
);
wrapper.find('button').simulate('click');
expect(onButtonClick.calledOnce).to.be.true;
expect(onButtonClick.calledOnce).to.equal(true);
});

});
Expand Down
2 changes: 1 addition & 1 deletion docs/api/ReactWrapper/contains.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ like the one passed in.

```jsx
const wrapper = mount(<MyComponent />);
expect(wrapper.contains(<div className="foo bar" />)).to.be.true;
expect(wrapper.contains(<div className="foo bar" />)).to.equal(true);
```


Expand Down
6 changes: 3 additions & 3 deletions docs/api/ReactWrapper/every.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = mount(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').every('.foo')).to.be.true;
expect(wrapper.find('.foo').every('.qoo')).to.be.false;
expect(wrapper.find('.foo').every('.bar')).to.be.false;
expect(wrapper.find('.foo').every('.foo')).to.equal(true);
expect(wrapper.find('.foo').every('.qoo')).to.equal(false);
expect(wrapper.find('.foo').every('.bar')).to.equal(false);
```

#### Related Methods
Expand Down
6 changes: 3 additions & 3 deletions docs/api/ReactWrapper/everyWhere.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = mount(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('foo'))).to.be.true;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('qoo'))).to.be.false;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('bar'))).to.be.false;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('foo'))).to.equal(true);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('qoo'))).to.equal(false);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('bar'))).to.equal(false);
```


Expand Down
2 changes: 1 addition & 1 deletion docs/api/ReactWrapper/forEach.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const wrapper = mount(
);

wrapper.find('.foo').forEach(function (node) {
expect(s.hasClass('foo')).to.be true;
expect(s.hasClass('foo')).to.equal(true);
});
```

Expand Down
2 changes: 1 addition & 1 deletion docs/api/ReactWrapper/hasClass.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Returns whether or not the current node has a `className` prop including the pas

```jsx
const wrapper = mount(<MyComponent />);
expect(wrapper.find('.my-button').hasClass('disabled')).to.be.true;
expect(wrapper.find('.my-button').hasClass('disabled')).to.equal(true);
```

### Common Gotchas
Expand Down
2 changes: 1 addition & 1 deletion docs/api/ReactWrapper/is.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ Returns whether or not the current node matches a provided selector.

```jsx
const wrapper = mount(<div className="some-class other-class" />);
expect(wrapper.is('.some-class')).to.be.true;
expect(wrapper.is('.some-class')).to.equal(true);
```

2 changes: 1 addition & 1 deletion docs/api/ReactWrapper/parent.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Returns a wrapper with the direct parent of the node in the current wrapper.

```jsx
const wrapper = mount(<ToDoList />);
expect(wrapper.find('ul').parent().is('div')).to.be.true;;
expect(wrapper.find('ul').parent().is('div')).to.equal(true);
```

#### Related Methods
Expand Down
4 changes: 2 additions & 2 deletions docs/api/ReactWrapper/setProps.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ expect(wrapper.find('.bar')).to.have.length(1);
const spy = sinon.spy(MyComponent.prototype, 'componentWillReceiveProps');

const wrapper = mount(<MyComponent foo="bar" />);
expect(spy.calledOnce).to.be.false;
expect(spy.calledOnce).to.equal(false);
wrapper.setProps({ foo: 'foo' });
expect(spy.calledOnce).to.be.true;
expect(spy.calledOnce).to.equal(true);
```


Expand Down
6 changes: 3 additions & 3 deletions docs/api/ReactWrapper/some.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = mount(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').some('.qoo')).to.be.true;
expect(wrapper.find('.foo').some('.foo')).to.be.true;
expect(wrapper.find('.foo').some('.bar')).to.be.false;
expect(wrapper.find('.foo').some('.qoo')).to.equal(true);
expect(wrapper.find('.foo').some('.foo')).to.equal(true);
expect(wrapper.find('.foo').some('.bar')).to.equal(false);
```

#### Related Methods
Expand Down
6 changes: 3 additions & 3 deletions docs/api/ReactWrapper/someWhere.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = mount(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('qoo'))).to.be.true;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('foo'))).to.be.true;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('bar'))).to.be.false;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('qoo'))).to.equal(true);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('foo'))).to.equal(true);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('bar'))).to.equal(false);
```


Expand Down
2 changes: 1 addition & 1 deletion docs/api/ShallowWrapper/contains.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ like the one passed in.

```jsx
const wrapper = shallow(<MyComponent />);
expect(wrapper.contains(<div className="foo bar" />)).to.be.true;
expect(wrapper.contains(<div className="foo bar" />)).to.equal(true);
```


Expand Down
6 changes: 3 additions & 3 deletions docs/api/ShallowWrapper/every.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = shallow(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').every('.foo')).to.be.true;
expect(wrapper.find('.foo').every('.qoo')).to.be.false;
expect(wrapper.find('.foo').every('.bar')).to.be.false;
expect(wrapper.find('.foo').every('.foo')).to.equal(true);
expect(wrapper.find('.foo').every('.qoo')).to.equal(false);
expect(wrapper.find('.foo').every('.bar')).to.equal(false);
```

#### Related Methods
Expand Down
6 changes: 3 additions & 3 deletions docs/api/ShallowWrapper/everyWhere.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = shallow(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('foo'))).to.be.true;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('qoo'))).to.be.false;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('bar'))).to.be.false;
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('foo'))).to.equal(true);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('qoo'))).to.equal(false);
expect(wrapper.find('.foo').everyWhere(n => n.hasClass('bar'))).to.equal(false);
```


Expand Down
2 changes: 1 addition & 1 deletion docs/api/ShallowWrapper/hasClass.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Returns whether or not the current node has a `className` prop including the pas

```jsx
const wrapper = shallow(<MyComponent />);
expect(wrapper.find('.my-button').hasClass('disabled')).to.be.true;
expect(wrapper.find('.my-button').hasClass('disabled')).to.equal(true);
```

### Common Gotchas
Expand Down
2 changes: 1 addition & 1 deletion docs/api/ShallowWrapper/is.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ Returns whether or not the current node matches a provided selector.

```jsx
const wrapper = shallow(<div className="some-class other-class" />);
expect(wrapper.is('.some-class')).to.be.true;
expect(wrapper.is('.some-class')).to.equal(true);
```

5 changes: 1 addition & 4 deletions docs/api/ShallowWrapper/parent.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@

Returns a wrapper with the direct parent of the node in the current wrapper.


#### Returns

`ShallowWrapper`: A new wrapper that wraps the resulting nodes.



#### Examples

```jsx
const wrapper = shallow(<ToDoList />);
expect(wrapper.find('ul').parent().is('div')).to.be.true;;
expect(wrapper.find('ul').parent().is('div')).to.equal(true);
```

#### Related Methods
Expand Down
4 changes: 2 additions & 2 deletions docs/api/ShallowWrapper/setProps.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ expect(wrapper.find('.bar')).to.have.length(1);
const spy = sinon.spy(MyComponent.prototype, 'componentWillReceiveProps');

const wrapper = shallow(<MyComponent foo="bar" />);
expect(spy.calledOnce).to.be.false;
expect(spy.calledOnce).to.equal(false);
wrapper.setProps({ foo: 'foo' });
expect(spy.calledOnce).to.be.true;
expect(spy.calledOnce).to.equal(true);
```


Expand Down
6 changes: 3 additions & 3 deletions docs/api/ShallowWrapper/some.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = shallow(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').some('.qoo')).to.be.true;
expect(wrapper.find('.foo').some('.foo')).to.be.true;
expect(wrapper.find('.foo').some('.bar')).to.be.false;
expect(wrapper.find('.foo').some('.qoo')).to.equal(true);
expect(wrapper.find('.foo').some('.foo')).to.equal(true);
expect(wrapper.find('.foo').some('.bar')).to.equal(false);
```

#### Related Methods
Expand Down
6 changes: 3 additions & 3 deletions docs/api/ShallowWrapper/someWhere.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const wrapper = shallow(
<div className="foo hoo" />
</div>
);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('qoo'))).to.be.true;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('foo'))).to.be.true;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('bar'))).to.be.false;
expect(wrapper.find('.foo').someWhere(n => n.hasClass('qoo'))).to.equal(true);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('foo'))).to.equal(true);
expect(wrapper.find('.foo').someWhere(n => n.hasClass('bar'))).to.equal(false);
```


Expand Down
4 changes: 2 additions & 2 deletions docs/api/mount.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('<Foo />', () => {
it('calls componentDidMount', () => {
spy(Foo.prototype, 'componentDidMount');
const wrapper = mount(<Foo />);
expect(Foo.prototype.componentDidMount.calledOnce).to.be.true;
expect(Foo.prototype.componentDidMount.calledOnce).to.equal(true);
});

it('allows us to set props', () => {
Expand All @@ -31,7 +31,7 @@ describe('<Foo />', () => {
<Foo onButtonClick={onButtonClick} />
);
wrapper.find('button').simulate('click');
expect(onButtonClick.calledOnce).to.be.true;
expect(onButtonClick.calledOnce).to.equal(true);
});

});
Expand Down
4 changes: 2 additions & 2 deletions docs/api/shallow.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('<MyComponent />', () => {
<div className="unique" />
</MyComponent>
);
expect(wrapper.contains(<div className="unique" />)).to.be.true;
expect(wrapper.contains(<div className="unique" />)).to.equal(true);
});

it('simulates click events', () => {
Expand All @@ -33,7 +33,7 @@ describe('<MyComponent />', () => {
<Foo onButtonClick={onButtonClick} />
);
wrapper.find('button').simulate('click');
expect(onButtonClick.calledOnce).to.be.true;
expect(onButtonClick.calledOnce).to.equal(true);
});

});
Expand Down
2 changes: 1 addition & 1 deletion src/ReactWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default class ReactWrapper {
* Example:
* ```
* const wrapper = mount(<MyComponent />);
* expect(wrapper.contains(<div className="foo bar" />)).to.be.true;
* expect(wrapper.contains(<div className="foo bar" />)).to.equal(true);
* ```
*
* @param {ReactElement} node
Expand Down
2 changes: 1 addition & 1 deletion src/ShallowWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export default class ShallowWrapper {
* Example:
* ```
* const wrapper = shallow(<MyComponent />);
* expect(wrapper.contains(<div className="foo bar" />)).to.be.true;
* expect(wrapper.contains(<div className="foo bar" />)).to.equal(true);
* ```
*
* @param {ReactElement} node
Expand Down
1 change: 0 additions & 1 deletion src/__tests__/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"rules": {
"padded-blocks": 0,
"no-unused-expressions": 0,
"react/no-multi-comp": 0,
"react/prop-types": 0,
"react/no-did-mount-set-state": 0,
Expand Down

0 comments on commit cb9419f

Please sign in to comment.