Merge pull request #58 from devzeebo/master

Fix non-chained default implementations (fixes #57)

src/when.js

@@ -31,6 +31,7 @@ class WhenMock {
     // Incrementing ids assigned to each call mock to help with sorting as new mocks are added
     this.nextCallMockId = 0
     this.fn = fn
+    fn.__whenMock__ = this
     this.callMocks = []
     this._origMock = fn.getMockImplementation()
 
@@ -114,7 +115,7 @@ class WhenMock {
 
 const when = (fn) => {
   if (fn.__whenMock__ instanceof WhenMock) return fn.__whenMock__
-  fn.__whenMock__ = new WhenMock(fn)
+  const whenMock = new WhenMock(fn)
   registry.add(fn)
   fn._origMockReset = fn.mockReset
   fn.mockReset = () => {
@@ -123,7 +124,7 @@ const when = (fn) => {
     fn._origMockReset = undefined
     fn.mockReset()
   }
-  return fn.__whenMock__
+  return whenMock
 }
 
 const resetAllWhenMocks = () => {

src/when.test.js

@@ -137,7 +137,7 @@ describe('When', () => {
       fn2(1)
 
       // Should be two call lines printed, hence the {2} at the end of the regex
-      expect(verifyAllWhenMocksCalled).toThrow(/(src\/when\.test\.js:\d{3}(.|\s)*){2}/)
+      expect(verifyAllWhenMocksCalled).toThrow(/(src(?:\\|\/)when\.test\.js:\d{3}(.|\s)*){2}/)
     })
   })
 
@@ -572,6 +572,31 @@ describe('When', () => {
       expect(fn('foo2')).toEqual('newDefault')
     })
 
+    it('allows defining the default NOT in a chained case', () => {
+      const fn = jest.fn()
+
+      when(fn).mockRejectedValue(false)
+
+      when(fn)
+        .calledWith(expect.anything())
+        .mockResolvedValue(true)
+
+      expect(fn()).rejects.toEqual(false)
+    })
+
+    it('allows overriding the default NOT in a chained case', () => {
+      const fn = jest.fn()
+
+      when(fn).mockReturnValue(1)
+      when(fn).mockReturnValue(2)
+
+      when(fn)
+        .calledWith(expect.anything())
+        .mockReturnValue(true)
+
+      expect(fn()).toEqual(2)
+    })
+
     it('will throw because of unintended usage', () => {
       const fn = jest.fn()