Fail when after/when are used with an incomplete expectation

Author: ryanplusplus

mock.lua

@@ -79,6 +79,8 @@ function MockExpectation:andWillReturn(...)
 end
 
 function MockExpectation:when(thunk)
+  if #self._calls == 0 then error('incomplete expectation', 2) end
+
   local function called(m, name, args)
     assert(#self._calls > 0, 'unexpected call')
     assert(self._calls[1]:functionMatches(m), 'unexpected function "' .. name .. '" called', 2)
@@ -93,6 +95,8 @@ function MockExpectation:when(thunk)
 end
 
 function MockExpectation:after(thunk)
+  if #self._calls == 0 then error('incomplete expectation', 2) end
+
   self:when(thunk)
 end
 

spec/mock_spec.lua

@@ -253,6 +253,22 @@ describe('The mock library', function()
     end)
   end)
 
+  it('should fail if when is not preceeded by shouldBeCalled or shouldBeCalledWith', function()
+    shouldFailWith('incomplete expectation', function()
+      local f = mock:mockFunction('f')
+
+      mock(f):when(function() end)
+    end)
+  end)
+
+  it('should fail if after is not preceeded by shouldBeCalled or shouldBeCalledWith', function()
+    shouldFailWith('incomplete expectation', function()
+      local f = mock:mockFunction('f')
+
+      mock(f):after(function() end)
+    end)
+  end)
+
   -- ordering
 
   -- allowed vs. not allowed functions on the expectation (ie: state machine for expectation)