bourne 1.1.1 → 1.1.2

data/README.md

@@ -1,4 +1,4 @@
-Bourne
+Bourne [![Build Status](https://secure.travis-ci.org/thoughtbot/bourne.png)](http://travis-ci.org/thoughtbot/bourne)
 ======
 
 Bourne extends mocha to allow detailed tracking and querying of stub and mock

data/bourne.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('mocha', '= 0.10.4')
+  s.add_dependency('mocha', '= 0.10.5')
 
   s.add_development_dependency('rake')
 end

data/lib/bourne/api.rb

@@ -51,7 +51,11 @@ module Mocha # :nodoc:
       end
 
       def failure_message
-        @expectation.mocha_inspect
+        message  = ""
+        if matching_stubs.empty?
+          message << "unstubbed, "
+        end
+        message << @expectation.mocha_inspect
       end
 
       private
@@ -71,6 +75,16 @@ module Mocha # :nodoc:
           invocation.mock.equal?(@mock)
         end
       end
+
+      def matching_stubs
+        Mockery.instance.stubba.stubba_methods.select do |method|
+          matching_stub?(method)
+        end
+      end
+
+      def matching_stub?(method)
+        method.mock.equal?(@mock) && method.method == @expected_method_name
+      end
     end
 
     # :call-seq:

data/lib/bourne/version.rb

@@ -1,3 +1,3 @@
 module Bourne
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/test/acceptance/acceptance_test_helper.rb

@@ -3,25 +3,25 @@ require 'test_runner'
 require 'mocha/configuration'
 
 module AcceptanceTest
-  
+
   class FakeLogger
-  
+
     attr_reader :warnings
-    
+
     def initialize
       @warnings = []
     end
-    
+
     def warn(message)
       @warnings << message
     end
-  
+
   end
-  
+
   attr_reader :logger
 
   include TestRunner
-  
+
   def setup_acceptance_test
     Mocha::Configuration.reset_configuration
     @logger = FakeLogger.new
@@ -29,10 +29,10 @@ module AcceptanceTest
     @original_logger = mockery.logger
     mockery.logger = @logger
   end
-  
+
   def teardown_acceptance_test
     Mocha::Configuration.reset_configuration
     Mocha::Mockery.instance.logger = @original_logger
   end
-  
+
 end

data/test/acceptance/mocha_example_test.rb

@@ -2,97 +2,97 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha'
 
 class MochaExampleTest < Test::Unit::TestCase
-  
+
   class Rover
-    
+
     def initialize(left_track, right_track, steps_per_metre, steps_per_degree)
       @left_track, @right_track, @steps_per_metre, @steps_per_degree = left_track, right_track, steps_per_metre, steps_per_degree
     end
-    
+
     def forward(metres)
       @left_track.step(metres * @steps_per_metre)
       @right_track.step(metres * @steps_per_metre)
       wait
     end
-    
+
     def backward(metres)
       forward(-metres)
     end
-    
+
     def left(degrees)
       @left_track.step(-degrees * @steps_per_degree)
       @right_track.step(+degrees * @steps_per_degree)
       wait
     end
-    
+
     def right(degrees)
       left(-degrees)
     end
-    
+
     def wait
       while (@left_track.moving? or @right_track.moving?); end
     end
-    
+
   end
-  
+
   def test_should_step_both_tracks_forward_ten_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_metre = 5
     rover = Rover.new(left_track, right_track, steps_per_metre, nil)
-    
+
     left_track.expects(:step).with(10)
     right_track.expects(:step).with(10)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.forward(2)
   end
-  
+
   def test_should_step_both_tracks_backward_ten_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_metre = 5
     rover = Rover.new(left_track, right_track, steps_per_metre, nil)
-    
+
     left_track.expects(:step).with(-10)
     right_track.expects(:step).with(-10)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.backward(2)
   end
-  
+
   def test_should_step_left_track_forwards_five_steps_and_right_track_backwards_five_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_degree = 5.0 / 90.0
     rover = Rover.new(left_track, right_track, nil, steps_per_degree)
-    
+
     left_track.expects(:step).with(+5)
     right_track.expects(:step).with(-5)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.right(90)
   end
-  
+
   def test_should_step_left_track_backwards_five_steps_and_right_track_forwards_five_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_degree = 5.0 / 90.0
     rover = Rover.new(left_track, right_track, nil, steps_per_degree)
-    
+
     left_track.expects(:step).with(-5)
     right_track.expects(:step).with(+5)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.left(90)
   end
-  
-end
+
+end

data/test/acceptance/spy_test.rb

@@ -7,11 +7,11 @@ module SpyTestMethods
   def setup
     setup_acceptance_test
   end
-  
+
   def teardown
     teardown_acceptance_test
   end
-  
+
   def test_should_accept_wildcard_stub_call_without_arguments
     instance = new_instance
     instance.stubs(:magic)
@@ -95,6 +95,12 @@ module SpyTestMethods
     flunk("Expected to fail")
   end
 
+  def test_should_warn_for_unstubbed_methods_with_expectations
+    new_instance.stubs(:unknown)
+
+    assert_fails(/unstubbed, expected exactly once/) { assert_matcher_accepts have_received(:unknown), new_instance }
+  end
+
   def test_should_reject_not_enough_calls
     instance = new_instance
     instance.stubs(:magic)
@@ -148,10 +154,10 @@ class StubEverythingSpyTest < Test::Unit::TestCase
   def setup
     setup_acceptance_test
   end
-  
+
   def teardown
     teardown_acceptance_test
-  end  
+  end
   def test_should_match_invocations_with_no_explicit_stubbing
     instance = stub_everything
     instance.surprise!

data/test/acceptance/stubba_example_test.rb

@@ -2,86 +2,86 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha'
 
 class Widget
-  
+
   def model
     'original_model'
   end
-    
+
   class << self
-  
+
     def find(options)
       []
     end
-  
+
     def create(attributes)
       Widget.new
     end
-  
+
   end
-  
+
 end
 
 module Thingy
-  
+
   def self.wotsit
     :hoojamaflip
   end
-  
+
 end
 
 class StubbaExampleTest < Test::Unit::TestCase
-  
+
   def test_should_stub_instance_method
     widget = Widget.new
     widget.expects(:model).returns('different_model')
     assert_equal 'different_model', widget.model
   end
-  
+
   def test_should_stub_module_method
     should_stub_module_method
   end
-  
+
   def test_should_stub_module_method_again
     should_stub_module_method
   end
-  
+
   def test_should_stub_class_method
     should_stub_class_method
   end
-  
+
   def test_should_stub_class_method_again
     should_stub_class_method
   end
-  
+
   def test_should_stub_instance_method_on_any_instance_of_a_class
     should_stub_instance_method_on_any_instance_of_a_class
   end
-  
+
   def test_should_stub_instance_method_on_any_instance_of_a_class_again
     should_stub_instance_method_on_any_instance_of_a_class
   end
-  
+
   def test_should_stub_two_different_class_methods
     should_stub_two_different_class_methods
   end
-  
+
   def test_should_stub_two_different_class_methods_again
     should_stub_two_different_class_methods
   end
-  
+
   private
-  
+
   def should_stub_module_method
     Thingy.expects(:wotsit).returns(:dooda)
     assert_equal :dooda, Thingy.wotsit
   end
-  
+
   def should_stub_class_method
     widgets = [Widget.new]
     Widget.expects(:find).with(:all).returns(widgets)
     assert_equal widgets, Widget.find(:all)
-  end 
-  
+  end
+
   def should_stub_two_different_class_methods
     found_widgets = [Widget.new]
     created_widget = Widget.new
@@ -90,7 +90,7 @@ class StubbaExampleTest < Test::Unit::TestCase
     assert_equal found_widgets, Widget.find(:all)
     assert_equal created_widget, Widget.create(:model => 'wombat')
   end
-  
+
   def should_stub_instance_method_on_any_instance_of_a_class
     Widget.any_instance.expects(:model).at_least_once.returns('another_model')
     widget_1 = Widget.new
@@ -99,4 +99,4 @@ class StubbaExampleTest < Test::Unit::TestCase
     assert_equal 'another_model', widget_2.model
   end
 
-end
+end

data/test/execution_point.rb

@@ -1,20 +1,20 @@
 class ExecutionPoint
-  
+
   attr_reader :backtrace
 
   def self.current
     new(caller)
   end
-  
+
   def initialize(backtrace)
     @backtrace = backtrace
   end
-  
+
   def file_name
     return "unknown" unless @backtrace && @backtrace.first
     /\A(.*?):\d+/.match(@backtrace.first)[1]
   end
-  
+
   def line_number
     return "unknown" unless @backtrace && @backtrace.first
     Integer(/\A.*?:(\d+)/.match(@backtrace.first)[1])
@@ -24,13 +24,13 @@ class ExecutionPoint
     return false unless other.is_a?(ExecutionPoint)
     (file_name == other.file_name) and (line_number == other.line_number)
   end
-  
+
   def to_s
     "file: #{file_name}; line: #{line_number}"
   end
-  
+
   def inspect
     to_s
   end
-  
+
 end

data/test/method_definer.rb

@@ -1,7 +1,7 @@
 require 'metaclass'
 
 module Mocha
-  
+
   module ObjectMethods
     def define_instance_method(method_symbol, &block)
       __metaclass__.send(:define_method, method_symbol, block)
@@ -16,7 +16,7 @@ module Mocha
       symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
     end
   end
-  
+
 end
 
 class Object

data/test/mini_test_result.rb

@@ -3,30 +3,30 @@ require 'test/unit/testcase'
 require 'minitest/unit'
 
 class MiniTestResult
-  
+
   FAILURE_PATTERN = %r{(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n}m
   ERROR_PATTERN   = %r{(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n}m
-  
+
   def self.parse_failure(raw)
     matches = FAILURE_PATTERN.match(raw)
     return nil unless matches
     Failure.new(matches[2], matches[3], [matches[4]], matches[5])
   end
-  
+
   def self.parse_error(raw)
     matches = ERROR_PATTERN.match(raw)
     return nil unless matches
     backtrace = raw.gsub(ERROR_PATTERN, '').split("\n").map(&:strip)
     Error.new(matches[2], matches[3], matches[4], backtrace)
   end
-  
+
   class Failure
     attr_reader :method, :test_case, :location, :message
     def initialize(method, test_case, location, message)
       @method, @test_case, @location, @message = method, test_case, location, message
     end
   end
-  
+
   class Error
     class Exception
       attr_reader :message, :backtrace
@@ -34,49 +34,49 @@ class MiniTestResult
         @message, @backtrace = message, location
       end
     end
-    
+
     attr_reader :method, :test_case, :exception
     def initialize(method, test_case, message, backtrace)
       @method, @test_case, @exception = method, test_case, Exception.new(message, backtrace)
     end
   end
-  
+
   def initialize(runner, test)
     @runner, @test = runner, test
   end
-  
+
   def failure_count
     @runner.failures
   end
-  
+
   def assertion_count
     @test._assertions
   end
-  
+
   def error_count
     @runner.errors
   end
-  
+
   def passed?
     @test.passed?
   end
-  
+
   def failures
     @runner.report.map { |puked| MiniTestResult.parse_failure(puked) }.compact
   end
-  
+
   def errors
     @runner.report.map { |puked| MiniTestResult.parse_error(puked) }.compact
   end
-  
+
   def failure_messages
     failures.map(&:message)
   end
-  
+
   def failure_message_lines
     failure_messages.map { |message| message.split("\n") }.flatten
   end
-  
+
   def error_messages
     errors.map { |e| e.exception.message }
   end