flexmock 0.8.7 → 0.8.8

data/README.rdoc

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.8.7
+Version :: 0.8.8
 
 = Links
 

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.8.7'
+PKG_VERSION = '0.8.8'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/flexmock/rspec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003, 2004, 2005, 2006, 2007, 2010 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -12,10 +12,15 @@
 require 'flexmock/base'
 
 class FlexMock
-  
+  if defined?(::RSpec)
+    SpecModule = RSpec
+  else
+    SpecModule = Spec
+  end
+
   class RSpecFrameworkAdapter
     def assert_block(msg, &block)
-      Spec::Expectations.fail_with(msg) unless yield
+      SpecModule::Expectations.fail_with(msg) unless yield
     end
 
     def assert_equal(a, b, msg=nil)
@@ -25,10 +30,9 @@ class FlexMock
 
     class AssertionFailedError < StandardError; end
     def assertion_failed_error
-      Spec::Expectations::ExpectationNotMetError
+      SpecModule::Expectations::ExpectationNotMetError
     end
   end
 
   @framework_adapter = RSpecFrameworkAdapter.new
-
-end
+end

data/test/test_record_mode.rb

@@ -1,161 +1,161 @@
-#!/usr/bin/env ruby
-
-#---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#+++
-
-require 'test/unit'
-require 'flexmock'
-require 'test/asserts'
-
-class TestRecordMode < Test::Unit::TestCase
-  include FlexMock::TestCase
-  include FlexMock::FailureAssertion
-
-  def test_recording_mode_works
-    mock = flexmock("mock")
-    mock.should_expect do |recorder|
-      recorder.f { :answer }
-    end
-    assert_equal :answer, mock.f
-  end
-
-  def test_arguments_are_passed_to_recording_mode_block
-    mock = flexmock("mock")
-    mock.should_expect do |recorder|
-      recorder.f(:arg) do |arg|
-        assert_equal :arg, arg
-        :answer
-      end
-    end
-    assert_equal :answer, mock.f(:arg)
-  end
-
-  def test_recording_mode_handles_multiple_returns
-    FlexMock.use("mock") do |mock|
-      mock.should_expect do |r|
-        answers = [1, 2]
-        # HACK: The following lambda is needed in Ruby 1.9 to cause
-        # the answers to be properly bound in the following block.
-        lambda { }
-        r.f { answers.shift }
-      end
-      assert_equal 1, mock.f
-      assert_equal 2, mock.f
-    end
-  end
-
-  def test_recording_mode_does_not_specify_order
-    FlexMock.use("mock") do |mock|
-      mock.should_expect do |r|
-        r.f { 1 }
-        r.g { 2 }
-      end
-      assert_equal 2, mock.g
-      assert_equal 1, mock.f
-    end
-  end
-
-  def test_recording_mode_gets_block_args_too
-    mock = flexmock("mock")
-    mock.should_expect do |r|
-      r.f(1, Proc) { |arg, block|
-        assert_not_nil block
-        block.call
-      }
-    end
-
-    assert_equal :block_result, mock.f(1) { :block_result }
-  end
-
-  def test_recording_mode_should_validate_args_with_equals
-    assert_failure do
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |r|
-          r.f(1)
-        end
-        mock.f(2)
-      end
-    end
-  end
-
-  def test_recording_mode_should_allow_arg_contraint_validation
-    assert_failure do 
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |r|
-          r.f(1)
-        end
-        mock.f(2)
-      end
-    end
-  end
-
-  def test_recording_mode_should_handle_multiplicity_contraints
-    assert_failure do
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |r|
-          r.f { :result }.once
-        end
-        mock.f
-        mock.f
-      end
-    end
-  end
-
-  def test_strict_record_mode_requires_exact_argument_matches
-    assert_failure do
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |rec|
-          rec.should_be_strict
-          rec.f(Integer)
-        end
-        mock.f(3)
-      end
-    end
-  end
-
-  def test_strict_record_mode_requires_exact_ordering
-    assert_failure do
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |rec|
-          rec.should_be_strict
-          rec.f(1)
-          rec.f(2)
-        end
-        mock.f(2)
-        mock.f(1)
-      end
-    end
-  end
-
-  def test_strict_record_mode_requires_once
-    assert_failure do
-      FlexMock.use("mock") do |mock|
-        mock.should_expect do |rec|
-          rec.should_be_strict
-          rec.f(1)
-        end
-        mock.f(1)
-        mock.f(1)
-      end
-    end
-  end
-
-  def test_strict_record_mode_can_not_fail
-    FlexMock.use("mock") do |mock|
-      mock.should_expect do |rec|
-        rec.should_be_strict
-        rec.f(Integer)
-        rec.f(2)
-      end
-      mock.f(Integer)
-      mock.f(2)
-    end
-  end
-
-end
+#!/usr/bin/env ruby
+
+#---
+# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#+++
+
+require 'test/unit'
+require 'flexmock'
+require 'test/asserts'
+
+class TestRecordMode < Test::Unit::TestCase
+  include FlexMock::TestCase
+  include FlexMock::FailureAssertion
+
+  def test_recording_mode_works
+    mock = flexmock("mock")
+    mock.should_expect do |recorder|
+      recorder.f { :answer }
+    end
+    assert_equal :answer, mock.f
+  end
+
+  def test_arguments_are_passed_to_recording_mode_block
+    mock = flexmock("mock")
+    mock.should_expect do |recorder|
+      recorder.f(:arg) do |arg|
+        assert_equal :arg, arg
+        :answer
+      end
+    end
+    assert_equal :answer, mock.f(:arg)
+  end
+
+  def test_recording_mode_handles_multiple_returns
+    FlexMock.use("mock") do |mock|
+      mock.should_expect do |r|
+        answers = [1, 2]
+        # HACK: The following lambda is needed in Ruby 1.9 to cause
+        # the answers to be properly bound in the following block.
+        lambda { }
+        r.f { answers.shift }
+      end
+      assert_equal 1, mock.f
+      assert_equal 2, mock.f
+    end
+  end
+
+  def test_recording_mode_does_not_specify_order
+    FlexMock.use("mock") do |mock|
+      mock.should_expect do |r|
+        r.f { 1 }
+        r.g { 2 }
+      end
+      assert_equal 2, mock.g
+      assert_equal 1, mock.f
+    end
+  end
+
+  def test_recording_mode_gets_block_args_too
+    mock = flexmock("mock")
+    mock.should_expect do |r|
+      r.f(1, Proc) { |arg, block|
+        assert_not_nil block
+        block.call
+      }
+    end
+
+    assert_equal :block_result, mock.f(1) { :block_result }
+  end
+
+  def test_recording_mode_should_validate_args_with_equals
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |r|
+          r.f(1)
+        end
+        mock.f(2)
+      end
+    end
+  end
+
+  def test_recording_mode_should_allow_arg_contraint_validation
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |r|
+          r.f(1)
+        end
+        mock.f(2)
+      end
+    end
+  end
+
+  def test_recording_mode_should_handle_multiplicity_contraints
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |r|
+          r.f { :result }.once
+        end
+        mock.f
+        mock.f
+      end
+    end
+  end
+
+  def test_strict_record_mode_requires_exact_argument_matches
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |rec|
+          rec.should_be_strict
+          rec.f(Integer)
+        end
+        mock.f(3)
+      end
+    end
+  end
+
+  def test_strict_record_mode_requires_exact_ordering
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |rec|
+          rec.should_be_strict
+          rec.f(1)
+          rec.f(2)
+        end
+        mock.f(2)
+        mock.f(1)
+      end
+    end
+  end
+
+  def test_strict_record_mode_requires_once
+    assert_failure do
+      FlexMock.use("mock") do |mock|
+        mock.should_expect do |rec|
+          rec.should_be_strict
+          rec.f(1)
+        end
+        mock.f(1)
+        mock.f(1)
+      end
+    end
+  end
+
+  def test_strict_record_mode_can_not_fail
+    FlexMock.use("mock") do |mock|
+      mock.should_expect do |rec|
+        rec.should_be_strict
+        rec.f(Integer)
+        rec.f(2)
+      end
+      mock.f(Integer)
+      mock.f(2)
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flexmock
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Jim Weirich
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -04:00
+date: 2010-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: []