flexmock 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03806072bb0d8d4aec632fc5afb44d54f8f9f6f9
-  data.tar.gz: b6d7c1a49f566b1cf6d38b51388f1196941098f0
+  metadata.gz: 7d8010b82bdccec43f2038e9b3698387e952027a
+  data.tar.gz: c034d8b46dec2354c06df15491213f1987d30309
 SHA512:
-  metadata.gz: a82fdf26a842b8f00177c8d00987563c749818c17c6d75e465200e7472c5de0aeac8654023ef8d295ae603e9918f9ed9e4927b6236f6f79c92d9814482b1f059
-  data.tar.gz: 3a236755c5b7754acc77c86e7595dfa4bec2800390eebbe6c2c9f9d4591b32e345ceda0b124769d169c123745fc268d7327aa4d8aa4c722ae0fec90baf308b4b
+  metadata.gz: f3bde508002be38eced12ee24efe4ad0092556da26930bbec98b3aed7a631035d84c943d01da70411d60085f2eb48ba8ca98584be2617f8f7f6cbd1d858acab2
+  data.tar.gz: 69a04f543a8a55765c354e061a94f1234dbfe8dc3c3963e7beeeccba74c534226936a0a528e96793f1a0a2349a9ba9c86706085fe001a191a421dfe3ce2ef931

data/lib/flexmock/core.rb

@@ -85,6 +85,11 @@ class FlexMock
 
   # Teardown and infrastructure setup for this mock.
   def flexmock_teardown
+    @flexmock_closed = true
+  end
+
+  def flexmock_closed?
+    @flexmock_closed
   end
 
   # Ignore all undefined (missing) method calls.
@@ -105,7 +110,9 @@ class FlexMock
     call_record = CallRecord.new(sym, enhanced_args, block_given?)
     @calls << call_record
     flexmock_wrap do
-      if handler = @expectations[sym]
+      if flexmock_closed?
+        FlexMock.undefined
+      elsif handler = @expectations[sym]
         handler.call(enhanced_args, call_record)
       elsif @base_class && @base_class.flexmock_defined?(sym)
         FlexMock.undefined

data/lib/flexmock/expectation.rb

@@ -82,8 +82,8 @@ class FlexMock
     # Verify the current call with the given arguments matches the
     # expectations recorded in this object.
     def verify_call(*args)
-      validate_order
       validate_eligible
+      validate_order
       @actual_count += 1
       perform_yielding(args)
       return_value(args)
@@ -138,10 +138,14 @@ class FlexMock
     # Validate that the order
     def validate_order
       if @order_number
-        @mock.flexmock_validate_order(to_s, @order_number)
+        @mock.flexmock_validate_order(
+          to_s, @order_number,
+          SpyDescribers.describe_calls(@mock))
       end
       if @global_order_number
-        @mock.flexmock_container.flexmock_validate_order(to_s, @global_order_number)
+        @mock.flexmock_container.flexmock_validate_order(
+          to_s, @global_order_number,
+          SpyDescribers.describe_calls(@mock))
       end
     end
     private :validate_order

data/lib/flexmock/ordering.rb

@@ -39,11 +39,16 @@ class FlexMock
       @flexmock_current_order = value
     end
 
-    def flexmock_validate_order(method_name, order_number)
-      FlexMock.check("method #{method_name} called out of order " +
-        "(expected order #{order_number}, was #{flexmock_current_order})") {
+    def flexmock_validate_order(method_name, order_number, calls_description = nil)
+      msg = "method #{method_name} called out of order " +
+        "(expected order #{order_number}, was #{flexmock_current_order})"
+      if calls_description
+        msg += "\n#{calls_description}"
+      end
+
+      FlexMock.check(msg) do
         order_number >= self.flexmock_current_order
-      }
+      end
       self.flexmock_current_order = order_number
     end
   end

data/lib/flexmock/spy_describers.rb

@@ -17,8 +17,6 @@ class FlexMock
         describe_spy(spy, sym, args, options, " NOT")
       end
 
-      private
-
       def describe_spy(spy, sym, args, options, not_clause="")
         result = "expected "
         result << call_description(sym, args)
@@ -88,6 +86,7 @@ class FlexMock
           "#{sym}(...)"
         end
       end
+      extend SpyDescribers
     end
 
 end

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -176,4 +176,3 @@ signing_key:
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []
-has_rdoc: