From 30313f74fccc9c236e8bca68551a8e206a899a6a Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 18 Mar 2019 23:17:55 +0900 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: koba04 --- packages/enzyme-test-suite/test/ReactWrapper-spec.jsx | 4 +++- packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx | 4 +++- packages/enzyme/src/ReactWrapper.js | 4 ++-- packages/enzyme/src/ShallowWrapper.js | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx index 451abe8a1..a1bcd7670 100644 --- a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx @@ -5436,7 +5436,8 @@ describeWithDOM('mount', () => { wrapper.find('button').invoke('onClick')(); expect(wrapper.state('count')).to.equal(1); }); - it('can return the handlers return value', () => { + + it('can return the handlers’ return value', () => { const spy = sinon.stub().returns(123); class Foo extends React.Component { render() { @@ -5452,6 +5453,7 @@ describeWithDOM('mount', () => { expect(value).to.equal(123); expect(spy.called).to.equal(true); }); + it('can pass in arguments', () => { const spy = sinon.spy(); class Foo extends React.Component { diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx index a826b218e..eadd7414a 100644 --- a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx +++ b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx @@ -5517,7 +5517,8 @@ describe('shallow', () => { wrapper.find('button').invoke('onClick')(); expect(wrapper.state('count')).to.equal(1); }); - it('can return the handlers return value', () => { + + it('can return the handlers’ return value', () => { const spy = sinon.stub().returns(123); class Foo extends React.Component { render() { @@ -5533,6 +5534,7 @@ describe('shallow', () => { expect(value).to.equal(123); expect(spy.called).to.equal(true); }); + it('can pass in arguments', () => { const spy = sinon.spy(); class Foo extends React.Component { diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js index 5de937047..e272d793a 100644 --- a/packages/enzyme/src/ReactWrapper.js +++ b/packages/enzyme/src/ReactWrapper.js @@ -813,10 +813,10 @@ class ReactWrapper { return this.single('invoke', () => { const handler = this.prop(propName); if (typeof handler !== 'function') { - throw new TypeError('ReactWrapper::invoke() expects a function prop name as its first argument'); + throw new TypeError('ReactWrapper::invoke() requires the name of a prop whose value is a function'); } return (...args) => { - const response = handler.apply(this, args); + const response = handler(...args); this[ROOT].update(); return response; }; diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js index b7d4f6cf1..41950dbf9 100644 --- a/packages/enzyme/src/ShallowWrapper.js +++ b/packages/enzyme/src/ShallowWrapper.js @@ -1143,10 +1143,10 @@ class ShallowWrapper { return this.single('invoke', () => { const handler = this.prop(propName); if (typeof handler !== 'function') { - throw new TypeError('ShallowWrapper::invoke() expects a function prop name as its first argument'); + throw new TypeError('ShallowWrapper::invoke() requires the name of a prop whose value is a function'); } return (...args) => { - const response = handler.apply(this, args); + const response = handler(...args); this[ROOT].update(); return response; };