Merge pull request #139 from jamesplease/bug-fixies

Add test demonstrating gh-137

Author: jamesplease

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### v2.0.3 (2018/3/2)
+
+**Bug Fixes**
+
+* Fixes a bug where the `lazy` prop was not always respected. Anytime that a new request key was generated,
+  a request would be made.
+
 ### v2.0.2 (2018/2/21)
 
 **Bug Fixes**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-request",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Declarative HTTP requests with React.",
   "main": "lib/index.js",
   "module": "es/index.js",

src/fetch.js

@@ -109,7 +109,7 @@ export class Fetch extends React.Component {
         method: this.props.method.toUpperCase()
       });
 
-    if (currentRequestKey !== nextRequestKey) {
+    if (currentRequestKey !== nextRequestKey && !this.isLazy(nextProps)) {
       this.fetchData(nextProps);
     }
   }

test/index.test.js

@@ -1428,4 +1428,21 @@ describe('laziness', () => {
       expect(beforeFetchMock).toHaveBeenCalledTimes(1);
     });
   });
+
+  test('it should be respected when the props change', () => {
+    fetchMock.get('/test/hangs/double-request2', hangingPromise());
+
+    const afterFetchMock = jest.fn();
+
+    const wrapper = shallow(
+      <Fetch url="/test/hangs" afterFetch={afterFetchMock} lazy />
+    );
+
+    wrapper.setProps({
+      url: '/test/hangs/double-request2'
+    });
+
+    expect(fetchMock.calls('/test/hangs').length).toBe(0);
+    expect(fetchMock.calls('/test/hangs/double-request2').length).toBe(0);
+  });
 });