[Tests] use better matchers

enzymejs · Jul 21, 2018 · f4d779d · f4d779d
1 parent 19f6fbb
commit f4d779d
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -204,7 +204,7 @@ import Foo from './Foo';
 describe('<Foo />', () => {
   it('renders three `.foo-bar`s', () => {
     const wrapper = render(<Foo />);
-    expect(wrapper.find('.foo-bar').length).to.equal(3);
+    expect(wrapper.find('.foo-bar')).to.have.lengthOf(3);
   });
 
   it('renders the title', () => {

diff --git a/docs/api/ReactWrapper/mount.md b/docs/api/ReactWrapper/mount.md
@@ -41,17 +41,17 @@ Foo.propTypes = {
 };
 
 const wrapper = mount(<Foo id="foo" />);
-expect(willMount.callCount).to.equal(1);
-expect(didMount.callCount).to.equal(1);
-expect(willUnmount.callCount).to.equal(0);
+expect(willMount).to.have.property('callCount', 1);
+expect(didMount).to.have.property('callCount', 1);
+expect(willUnmount).to.have.property('callCount', 0);
 wrapper.unmount();
-expect(willMount.callCount).to.equal(1);
-expect(didMount.callCount).to.equal(1);
-expect(willUnmount.callCount).to.equal(1);
+expect(willMount).to.have.property('callCount', 1);
+expect(didMount).to.have.property('callCount', 1);
+expect(willUnmount).to.have.property('callCount', 1);
 wrapper.mount();
-expect(willMount.callCount).to.equal(2);
-expect(didMount.callCount).to.equal(2);
-expect(willUnmount.callCount).to.equal(1);
+expect(willMount).to.have.property('callCount', 2);
+expect(didMount).to.have.property('callCount', 2);
+expect(willUnmount).to.have.property('callCount', 1);
 ```
 
 

diff --git a/docs/api/ReactWrapper/setProps.md b/docs/api/ReactWrapper/setProps.md
@@ -52,9 +52,9 @@ import sinon from 'sinon';
 const spy = sinon.spy(MyComponent.prototype, 'componentWillReceiveProps');
 
 const wrapper = mount(<MyComponent foo="bar" />);
-expect(spy.calledOnce).to.equal(false);
+expect(spy).to.have.property('callCount', 0);
 wrapper.setProps({ foo: 'foo' });
-expect(spy.calledOnce).to.equal(true);
+expect(spy).to.have.property('callCount', 1);
 ```
 
 

diff --git a/docs/api/ReactWrapper/unmount.md b/docs/api/ReactWrapper/unmount.md
@@ -40,13 +40,13 @@ Foo.propTypes = {
   id: PropTypes.string.isRequired,
 };
 const wrapper = mount(<Foo id="foo" />);
-expect(willMount.callCount).to.equal(1);
-expect(didMount.callCount).to.equal(1);
-expect(willUnmount.callCount).to.equal(0);
+expect(willMount).to.have.property('callCount', 1);
+expect(didMount).to.have.property('callCount', 1);
+expect(willUnmount).to.have.property('callCount', 0);
 wrapper.unmount();
-expect(willMount.callCount).to.equal(1);
-expect(didMount.callCount).to.equal(1);
-expect(willUnmount.callCount).to.equal(1);
+expect(willMount).to.have.property('callCount', 1);
+expect(didMount).to.have.property('callCount', 1);
+expect(willUnmount).to.have.property('callCount', 1);
 ```
 
 

diff --git a/docs/api/ShallowWrapper/setProps.md b/docs/api/ShallowWrapper/setProps.md
@@ -52,9 +52,9 @@ import sinon from 'sinon';
 const spy = sinon.spy(MyComponent.prototype, 'componentWillReceiveProps');
 
 const wrapper = shallow(<MyComponent foo="bar" />);
-expect(spy.calledOnce).to.equal(false);
+expect(spy).to.have.property('callCount', 0);
 wrapper.setProps({ foo: 'foo' });
-expect(spy.calledOnce).to.equal(true);
+expect(spy).to.have.property('callCount', 1);
 ```
 
 

diff --git a/docs/api/ShallowWrapper/unmount.md b/docs/api/ShallowWrapper/unmount.md
@@ -36,7 +36,7 @@ Foo.propTypes = {
   id: PropTypes.string.isRequired,
 };
 const wrapper = shallow(<Foo id="foo" />);
-expect(spy.calledOnce).to.equal(false);
+expect(spy).to.have.property('callCount', 0);
 wrapper.unmount();
-expect(spy.calledOnce).to.equal(true);
+expect(spy).to.have.property('callCount', 1);
 ```
diff --git a/docs/api/mount.md b/docs/api/mount.md
@@ -19,7 +19,7 @@ describe('<Foo />', () => {
   it('calls componentDidMount', () => {
     sinon.spy(Foo.prototype, 'componentDidMount');
     const wrapper = mount(<Foo />);
-    expect(Foo.prototype.componentDidMount.calledOnce).to.equal(true);
+    expect(Foo.prototype.componentDidMount).to.have.property('callCount', 1);
   });
 
   it('allows us to set props', () => {
@@ -35,7 +35,7 @@ describe('<Foo />', () => {
       <Foo onButtonClick={onButtonClick} />
     ));
     wrapper.find('button').simulate('click');
-    expect(onButtonClick.calledOnce).to.equal(true);
+    expect(onButtonClick).to.have.property('callCount', 1);
   });
 });
 ```

diff --git a/docs/api/shallow.md b/docs/api/shallow.md
@@ -34,7 +34,7 @@ describe('<MyComponent />', () => {
     const onButtonClick = sinon.spy();
     const wrapper = shallow(<Foo onButtonClick={onButtonClick} />);
     wrapper.find('button').simulate('click');
-    expect(onButtonClick.calledOnce).to.equal(true);
+    expect(onButtonClick).to.have.property('callCount', 1);
   });
 });
 

diff --git a/docs/guides/lab.md b/docs/guides/lab.md
@@ -18,7 +18,7 @@ exports.lab = lab;
 lab.suite('A suite', () => {
   lab.test('calls componentDidMount', (done) => {
     const wrapper = mount(<Foo />);
-    Code.expect(Foo.prototype.componentDidMount.calledOnce).to.equal(true);
+    Code.expect(Foo.prototype.componentDidMount.callCount).to.equal(1);
     done();
   });
 });

diff --git a/docs/guides/mocha.md b/docs/guides/mocha.md
@@ -19,7 +19,7 @@ spy(Foo.prototype, 'componentDidMount');
 describe('<Foo />', () => {
   it('calls componentDidMount', () => {
     const wrapper = mount(<Foo />);
-    expect(Foo.prototype.componentDidMount.calledOnce).to.equal(true);
+    expect(Foo.prototype.componentDidMount).to.have.property('callCount', 1);
   });
 });
 

diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx
@@ -563,13 +563,13 @@ describe('Adapter', () => {
     renderer.render(<Counter />);
 
     let tree = renderer.getNode();
-    expect(tree.rendered.props.count).to.equal(0);
+    expect(tree.rendered.props).to.have.property('count', 0);
     tree.instance.increment();
     tree = renderer.getNode();
-    expect(tree.rendered.props.count).to.equal(1);
+    expect(tree.rendered.props).to.have.property('count', 1);
     tree.instance.increment();
     tree = renderer.getNode();
-    expect(tree.rendered.props.count).to.equal(2);
+    expect(tree.rendered.props).to.have.property('count', 2);
   });
 
   it('renders basic shallow as well', () => {

diff --git a/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx b/packages/enzyme-test-suite/test/RSTTraversal-spec.jsx
@@ -50,7 +50,7 @@ describe('RSTTraversal', () => {
       const spy = sinon.spy();
       const node = $(<div />);
       treeForEach(node, spy);
-      expect(spy.calledOnce).to.equal(true);
+      expect(spy).to.have.property('callCount', 1);
     });
 
     it('should handle a single child', () => {
@@ -61,7 +61,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(2);
+      expect(spy).to.have.property('callCount', 2);
     });
 
     it('should handle several children', () => {
@@ -73,7 +73,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(3);
+      expect(spy).to.have.property('callCount', 3);
     });
 
     it('should handle multiple hierarchies', () => {
@@ -87,7 +87,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(4);
+      expect(spy).to.have.property('callCount', 4);
     });
 
     it('should handle array children', () => {
@@ -104,7 +104,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(3);
+      expect(spy).to.have.property('callCount', 3);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB]);
     });
@@ -130,7 +130,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(5);
+      expect(spy).to.have.property('callCount', 5);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB, divC, divD]);
     });
@@ -149,7 +149,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(3);
+      expect(spy).to.have.property('callCount', 3);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB]);
     });
@@ -175,7 +175,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(5);
+      expect(spy).to.have.property('callCount', 5);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB, divC, divD]);
     });
@@ -194,7 +194,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(3);
+      expect(spy).to.have.property('callCount', 3);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB]);
     });
@@ -220,7 +220,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(5);
+      expect(spy).to.have.property('callCount', 5);
       const nodes = spy.args.map(arg => arg[0]);
       expect(nodes).to.deep.equal([node, divA, divB, divC, divD]);
     });
@@ -264,7 +264,7 @@ describe('RSTTraversal', () => {
         ));
 
         treeForEach(node, spy);
-        expect(spy.callCount).to.equal(3);
+        expect(spy).to.have.property('callCount', 3);
         const nodes = spy.args.map(arg => arg[0]);
         expect(nodes).to.deep.equal([node, divA, divB]);
       });
@@ -287,7 +287,7 @@ describe('RSTTraversal', () => {
         ));
 
         treeForEach(node, spy);
-        expect(spy.callCount).to.equal(5);
+        expect(spy).to.have.property('callCount', 5);
         const nodes = spy.args.map(arg => arg[0]);
         expect(nodes).to.deep.equal([node, divA, divB, divC, divD]);
       });
@@ -306,7 +306,7 @@ describe('RSTTraversal', () => {
         ));
 
         treeForEach(node, spy);
-        expect(spy.callCount).to.equal(3);
+        expect(spy).to.have.property('callCount', 3);
         const nodes = spy.args.map(arg => arg[0]);
         expect(nodes).to.deep.equal([node, divA, divB]);
       });
@@ -329,7 +329,7 @@ describe('RSTTraversal', () => {
         ));
 
         treeForEach(node, spy);
-        expect(spy.callCount).to.equal(5);
+        expect(spy).to.have.property('callCount', 5);
         const nodes = spy.args.map(arg => arg[0]);
         expect(nodes).to.deep.equal([node, divA, divB, divC, divD]);
       });
@@ -343,7 +343,7 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(3);
+      expect(spy).to.have.property('callCount', 3);
     });
 
     it('should pass in the node', () => {
@@ -357,11 +357,11 @@ describe('RSTTraversal', () => {
         </div>
       ));
       treeForEach(node, spy);
-      expect(spy.callCount).to.equal(4);
-      expect(spy.args[0][0].type).to.equal('div');
-      expect(spy.args[1][0].type).to.equal('button');
-      expect(spy.args[2][0].type).to.equal('nav');
-      expect(spy.args[3][0].type).to.equal('input');
+      expect(spy).to.have.property('callCount', 4);
+      expect(spy.args[0][0]).to.have.property('type', 'div');
+      expect(spy.args[1][0]).to.have.property('type', 'button');
+      expect(spy.args[2][0]).to.have.property('type', 'nav');
+      expect(spy.args[3][0]).to.have.property('type', 'input');
     });
 
   });
@@ -413,9 +413,9 @@ describe('RSTTraversal', () => {
 
       const nodeInTree = tree.rendered[1].rendered[0];
       const result = pathToNode(nodeInTree, tree);
-      expect(result.length).to.equal(2);
-      expect(result[0].type).to.equal('div');
-      expect(result[1].type).to.equal('nav');
+      expect(result).to.have.lengthOf(2);
+      expect(result[0]).to.have.property('type', 'div');
+      expect(result[1]).to.have.property('type', 'nav');
     });
 
     it('should return trees from the root node except the sibling node', () => {
@@ -432,9 +432,9 @@ describe('RSTTraversal', () => {
 
       const nodeInTree = tree.rendered[1].rendered[0];
       const result = pathToNode(nodeInTree, tree);
-      expect(result.length).to.equal(2);
-      expect(result[0].type).to.equal('div');
-      expect(result[1].type).to.equal('nav');
+      expect(result).to.have.lengthOf(2);
+      expect(result[0]).to.have.property('type', 'div');
+      expect(result[1]).to.have.property('type', 'nav');
     });
 
   });