flexmock 0.8.11 → 0.9.0

data/test/{test_rails_view_stub.rb → rails_view_stub_test.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test/test_setup'
 require 'flexmock/rails/view_mocking'
 
 module ViewTests
@@ -11,7 +11,7 @@ module ViewTests
 
   def test_fails_if_no_render
     should_render_view
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(assertion_failed_error) do
       flexmock_verify
     end
   end
@@ -24,7 +24,7 @@ module ViewTests
   def test_view_mocks_with_expectation_fails_with_different_template
     should_render_view("new")
     render "controller/edit"
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(assertion_failed_error) do
       flexmock_verify
     end
   end

data/test/{test_record_mode.rb → record_mode_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,13 +9,10 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
-require 'test/asserts'
+require 'test/test_setup'
 
 class TestRecordMode < Test::Unit::TestCase
   include FlexMock::TestCase
-  include FlexMock::FailureAssertion
 
   def test_recording_mode_works
     mock = flexmock("mock")

data/test/rspec_integration/integration_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,27 +9,33 @@
 # above copyright notice is included.
 #+++
 
-Spec::Runner.configure do |config|
-   config.mock_with :flexmock
+if defined?(RSpec)
+  RSpec.configure do |config|
+    config.mock_with :flexmock
+  end
+else
+  Spec::Runner.configure do |config|
+    config.mock_with :flexmock
+  end
 end
 
-context "FlexMock in a RSpec example" do
+describe "FlexMock in a RSpec example" do
   specify "should be able to create a mock" do
     m = flexmock()
   end
-  
+
   specify "should have an error when a mock is not called" do
     m = flexmock("Expectation Failured")
     m.should_receive(:hi).with().once
   end
-  
+
   specify "should be able to create a stub" do
     s = "Hello World"
     flexmock(:base, s).should_receive(:downcase).with().once.and_return("hello WORLD")
-    
+
     s.downcase.should == "hello WORLD"
   end
-  
+
   specify "Should show an example failure" do
     1.should == 2
   end

data/test/{test_samples.rb → samples_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,8 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 
 # Sample FlexMock Usage.
 
@@ -64,7 +63,7 @@ end
 
 class TestDog < Test::Unit::TestCase
   include FlexMock::TestCase
-  
+
   def test_dog_wags
     tail_mock = flexmock(:wag => :happy)
     assert_equal :happy, tail_mock.wag
@@ -88,14 +87,14 @@ end
 
 class TestDogBarking < Test::Unit::TestCase
   include FlexMock::TestCase
-  
-  # Setup the tests by mocking the +new+ method of 
+
+  # Setup the tests by mocking the +new+ method of
   # Woofer and return a mock woofer.
   def setup
     @dog = Dog.new
     flexmock(@dog, :bark => :grrr)
   end
-  
+
   def test_dog
     assert_equal :grrr, @dog.bark   # Mocked Method
     assert_equal :happy, @dog.wag    # Normal Method
@@ -104,13 +103,13 @@ end
 
 class TestDogBarkingWithNewInstances < Test::Unit::TestCase
   include FlexMock::TestCase
-  
+
   # Setup the tests by mocking Woofer to always
   # return partial mocks.
   def setup
     flexmock(Woofer).new_instances.should_receive(:woof => :grrr)
   end
-  
+
   def test_dog
     assert_equal :grrr, Dog.new.bark  # All dog objects
     assert_equal :grrr, Dog.new.bark  # are mocked.
@@ -124,13 +123,13 @@ class TestDefaults < Test::Unit::TestCase
     @mock_dog = flexmock("Fido")
     @mock_dog.should_receive(:tail => :a_tail, :bark => "woof").by_default
   end
-  
+
   def test_something_where_bark_must_be_called_once
     @mock_dog.should_receive(:bark => "bow wow").once
 
     assert_equal "bow wow", @mock_dog.bark
     assert_equal :a_tail, @mock_dog.tail
-  end 
+  end
 end
 
 class TestDemeter < Test::Unit::TestCase
@@ -180,7 +179,7 @@ class TestDb < Test::Unit::TestCase
     db.should_receive(:query).and_return([1,2,3]).ordered
     db.should_receive(:update).and_return(nil).ordered
     # test code here
-    assert_raises(Test::Unit::AssertionFailedError) do
+    assert_raises(assertion_failed_error) do
       db.update
       db.query
     end
@@ -220,7 +219,7 @@ class TestDb < Test::Unit::TestCase
     db.query("asdf")
     db.finish
   end
-  
+
   def known_good_way_to_build_xml(builder)
     builder.html
   end
@@ -237,7 +236,7 @@ class TestDb < Test::Unit::TestCase
     end
     new_way_to_build_xml(builder)       # compare to new way
   end
-  
+
 end
 
 class TestMoreSamples < Test::Unit::TestCase

data/test/{test_should_ignore_missing.rb → should_ignore_missing_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,9 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
-require 'test/asserts'
+require 'test/test_setup'
 
 class TestShouldIgnoreMissing < Test::Unit::TestCase
   include FlexMock::TestCase
@@ -19,7 +17,7 @@ class TestShouldIgnoreMissing < Test::Unit::TestCase
   def setup
     @mock = flexmock("mock")
   end
-  
+
   def test_mocks_do_not_respond_to_undefined_methods
     assert !@mock.respond_to?(:unknown_foo)
   end
@@ -67,7 +65,7 @@ class TestShouldIgnoreMissing < Test::Unit::TestCase
     @mock.should_receive(:known_foo).once
     method_proc = @mock.method(:known_foo)
     assert_not_nil method_proc
-    assert_raises Test::Unit::AssertionFailedError do
+    assert_raises assertion_failed_error do
       flexmock_teardown
     end
   end

data/test/{test_should_receive.rb → should_receive_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,9 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
-require 'test/asserts'
+require 'test/test_setup'
 
 def mock_top_level_function
   :mtlf
@@ -33,7 +31,6 @@ end
 
 class TestFlexMockShoulds < Test::Unit::TestCase
   include FlexMock::TestCase
-  include FlexMock::FailureAssertion
 
   # Expected error messages on failures
   COUNT_ERROR_MESSAGE = /\bcalled\s+incorrect\s+number\s+of\s+times\b/
@@ -42,7 +39,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   AT_MOST_ERROR_MESSAGE = /\bshould\s+be\s+called\s+at\s+most\b/
   OUT_OF_ORDER_ERROR_MESSAGE = /\bcalled\s+out\s+of\s+order\b/
   NON_CONTAINER_MESSAGE = /\bis\s+not\s+in\s+a\s+container\b/
-  
+
   def test_defaults
     FlexMock.use do |m|
       m.should_receive(:hi)
@@ -59,7 +56,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       assert_equal 1, m.hi(123)
     end
   end
-  
+
   def test_returns_with_multiple_values
     FlexMock.use do |m|
       m.should_receive(:hi).and_return(1,2,3)
@@ -241,7 +238,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   def test_raises_is_an_alias_for_and_raise
     FlexMock.use do |m|
       m.should_receive(:failure).raises(RuntimeError)
-      ex = assert_raise RuntimeError do
+      assert_raise RuntimeError do
         m.failure
       end
     end
@@ -308,7 +305,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     FlexMock.use do |m|
       m.should_receive(:hi).with(1).returns(10)
       m.should_receive(:hi).with(2).returns(20)
-      
+
       assert_equal 10, m.hi(1)
       assert_equal 20, m.hi(2)
     end
@@ -322,7 +319,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_with_no_args_but_with_args
-    ex = assert_failure(NO_MATCH_ERROR_MESSAGE) do
+    assert_failure(NO_MATCH_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with_no_args
         m.hi(1)
@@ -425,7 +422,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     FlexMock.use do |m|
       m.should_receive(:hi).with(/one/).returns(10)
       m.should_receive(:hi).with(/t/).returns(20)
-      
+
       assert_equal 10, m.hi("one")
       assert_equal 10, m.hi("done")
       assert_equal 20, m.hi("two")
@@ -444,7 +441,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     FlexMock.use do |m|
       m.should_receive(:hi).with(Fixnum).returns(10)
       m.should_receive(:hi).with(Object).returns(20)
-      
+
       assert_equal 10, m.hi(319)
       assert_equal 10, m.hi(Fixnum)
       assert_equal 20, m.hi("hi")
@@ -512,7 +509,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_never_and_called_once
-    ex = assert_failure(COUNT_ERROR_MESSAGE) do    
+    assert_failure(COUNT_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).never
         m.hi(1)
@@ -528,7 +525,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_once_but_never_called
-    ex = assert_failure(COUNT_ERROR_MESSAGE) do
+    assert_failure(COUNT_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).once
       end
@@ -536,7 +533,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_once_but_called_twice
-    ex = assert_failure(COUNT_ERROR_MESSAGE) do
+    assert_failure(COUNT_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).once
         m.hi(1)
@@ -588,7 +585,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_at_least_but_never_called
-    ex = assert_failure(AT_LEAST_ERROR_MESSAGE) do
+    assert_failure(AT_LEAST_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).at_least.once
       end
@@ -604,7 +601,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_at_least_and_exact
-    ex = assert_failure(COUNT_ERROR_MESSAGE) do
+    assert_failure(COUNT_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).at_least.once.once
         m.hi(1)
@@ -627,7 +624,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_at_most_called_twice
-    ex = assert_failure(AT_MOST_ERROR_MESSAGE) do
+    assert_failure(AT_MOST_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).at_most.once
         m.hi(1)
@@ -637,7 +634,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_at_most_and_at_least_called_never
-    ex = assert_failure(AT_LEAST_ERROR_MESSAGE) do
+    assert_failure(AT_LEAST_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).at_least.once.at_most.twice
       end
@@ -660,7 +657,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_at_most_and_at_least_called_three_times
-    ex = assert_failure(AT_MOST_ERROR_MESSAGE) do
+    assert_failure(AT_MOST_ERROR_MESSAGE) do
       FlexMock.use do |m|
         m.should_receive(:hi).with(1).returns(10).at_least.once.at_most.twice
         m.hi(1)
@@ -709,7 +706,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_ordered_calls_out_of_order_will_fail
-    ex = assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
+    assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
       FlexMock.use 'm' do |m|
         m.should_receive(:hi).ordered
         m.should_receive(:lo).ordered
@@ -724,14 +721,14 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     FlexMock.use 'm' do |m|
       m.should_receive(:hi).with("one").ordered
       m.should_receive(:hi).with("two").ordered
-      
+
       m.hi("one")
       m.hi("two")
     end
   end
 
   def test_order_calls_with_different_arg_lists_and_out_of_order_will_fail
-    ex = assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
+    assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
       FlexMock.use 'm' do |m|
         m.should_receive(:hi).with("one").ordered
         m.should_receive(:hi).with("two").ordered
@@ -747,7 +744,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       m.should_receive(:blah)
       m.should_receive(:hi).ordered
       m.should_receive(:lo).ordered
-      
+
       m.blah
       m.hi
       m.blah
@@ -760,7 +757,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     FlexMock.use 'm' do |m|
       m.should_receive(:hi).ordered
       m.should_receive(:lo).ordered
-      
+
       m.hi
       m.hi
       m.lo
@@ -774,7 +771,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       m.should_receive(:flip).ordered(2)
       m.should_receive(:flop).ordered(2)
       m.should_receive(:final).ordered
-      
+
       m.start
       m.flop
       m.flip
@@ -789,7 +786,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       m.should_receive(:flip).ordered(:flip_flop_group)
       m.should_receive(:flop).ordered(:flip_flop_group)
       m.should_receive(:final).ordered
-      
+
       m.start
       m.flop
       m.flip
@@ -809,7 +806,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
   end
 
   def test_explicit_ordering_with_explicit_misorders
-    ex = assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do 
+    assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
       FlexMock.use 'm' do |m|
         m.should_receive(:hi).ordered(:first_group)
         m.should_receive(:lo).ordered(:second_group)
@@ -822,7 +819,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     # assert_match /first_group/, ex.message
     # assert_match /second_group/, ex.message
   end
-  
+
   # Test submitted by Mikael Pahmp to correct expectation matching.
   def test_ordering_with_explicit_no_args_matches_correctly
     FlexMock.use("m") do |m|
@@ -831,11 +828,11 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       m.should_receive(:foo).with_no_args.once.ordered
       m.foo
       m.bar
-      m.foo  
+      m.foo
     end
   end
 
-  # Test submitted by Mikael Pahmp to correct expectation matching.  
+  # Test submitted by Mikael Pahmp to correct expectation matching.
   def test_ordering_with_any_arg_matching_correctly_matches
     FlexMock.use("m") do |m|
       m.should_receive(:foo).with_any_args.once.ordered
@@ -843,8 +840,8 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       m.should_receive(:foo).with_any_args.once.ordered
       m.foo
       m.bar
-      m.foo  
-    end  
+      m.foo
+    end
   end
 
   def test_ordering_between_mocks_is_not_normally_defined
@@ -858,13 +855,13 @@ class TestFlexMockShoulds < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_ordering_between_mocks_is_honored_for_global_ordering
-    ex = assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do 
+    assert_failure(OUT_OF_ORDER_ERROR_MESSAGE) do
       FlexMock.use("x", "y") do |x, y|
         x.should_receive(:one).globally.ordered
         y.should_receive(:two).globally.ordered
-        
+
         y.two
         x.one
       end
@@ -930,7 +927,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     m.should_receive(:foo).and_return(:bar).by_default
     assert_equal :bar, m.foo
   end
-    
+
   def test_default_expectations_are_search_in_the_proper_order
     m = flexmock("m")
     m.should_receive(:foo).with(Integer).once.and_return(:first).by_default
@@ -938,11 +935,11 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     assert_equal :first, m.foo(1)
     assert_equal :second, m.foo(1)
   end
-    
+
   def test_expectations_with_count_constraints_can_by_marked_as_default
     m = flexmock("m")
     m.should_receive(:foo).and_return(:bar).once.by_default
-    assert_raise Test::Unit::AssertionFailedError do
+    assert_raise assertion_failed_error do
       flexmock_teardown
     end
   end
@@ -959,7 +956,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     m = flexmock("m")
     m.should_receive(:foo).with(1).and_return(:bar).once.by_default
     m.should_receive(:foo).with(2).and_return(:baz).once
-    assert_raise Test::Unit::AssertionFailedError do
+    assert_raise assertion_failed_error do
       # This expectation should be hidded by the non-result
       m.foo(1)
     end
@@ -971,7 +968,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     m.should_receive(:foo).ordered.by_default
     m.should_receive(:bar).ordered.by_default
     m.bar
-    assert_raise Test::Unit::AssertionFailedError do m.foo end
+    assert_raise assertion_failed_error do m.foo end
   end
 
   def test_ordered_default_expectations_can_be_overridden
@@ -1066,7 +1063,7 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     assert_operator(:=~) { |m| m =~ :x }
     assert_operator(:"`") { |m| m.`("command") } # `
   end
-    
+
   private
 
   def assert_operator(op, &block)