flexmock 1.3.0 → 1.3.1

data/test/based_partials_test.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+#---
+# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# 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/test_setup'
+
+class BasedPartialsTest < Test::Unit::TestCase
+  include FlexMock::TestCase
+
+  def setup
+    super
+    FlexMock.partials_are_based = true
+  end
+
+  def teardown
+    FlexMock.partials_are_based = false
+    super
+  end
+
+  class Dog
+    def bark
+      :woof
+    end
+  end
+
+  def test_based_partials_allow_stubbing_defined_methods
+    dog = Dog.new
+    flexmock(dog).should_receive(:bark => :mock_value)
+    assert_equal :mock_value, dog.bark
+  end
+
+  def test_based_partials_disallow_stubbing_undefined_methods
+    dog = Dog.new
+    assert_raise(NoMethodError, /cannot stub.*wag.*explicitly/) do
+      flexmock(dog).should_receive(:wag => :mock_value)
+    end
+  end
+
+  def test_based_partials_allow_explicitly_stubbing_undefined_methods
+    dog = Dog.new
+    flexmock(dog).should_receive(:wag).explicitly.and_return(:mock_value)
+  end
+
+end

data/test/default_framework_adapter_test.rb

@@ -18,15 +18,15 @@ class TestFlexmockDefaultFrameworkAdapter < Test::Unit::TestCase
 
   def test_assert_block_raises_exception
     assert_raise(FlexMock::DefaultFrameworkAdapter::AssertionFailedError) {
-      @adapter.assert_block("failure message") { false }
+      @adapter.make_assertion("failure message") { false }
     }
   end
 
-  def test_assert_block_doesnt_raise_exception
-    @adapter.assert_block("failure message") { true }
+  def test_make_assertion_doesnt_raise_exception
+    @adapter.make_assertion("failure message") { true }
   end
 
-  def test_assert_equal_doesnt_raise_exception
+  def test_make_assertion_doesnt_raise_exception
     @adapter.assert_equal("a", "a", "no message")
   end
 

data/test/partial_mock_test.rb

@@ -400,6 +400,21 @@ class TestStubbing < Test::Unit::TestCase
     assert_equal :hiss, dog.meow
   end
 
+  def test_partial_mocks_allow_stubbing_defined_methods_when_using_on
+    dog = Dog.new
+    flexmock(dog, :on, Dog)
+    dog.should_receive(:bark).and_return(:grrr)
+    assert_equal :grrr, dog.bark
+  end
+
+  def test_partial_mocks_disallow_stubbing_undefined_methods_when_using_on
+    dog = Dog.new
+    flexmock(dog, :on, Dog)
+    assert_raise(NoMethodError, /meow.*explicitly/) do
+      dog.should_receive(:meow).and_return(:something)
+    end
+  end
+
   # The following test was suggested by Pat Maddox for the RSpec
   # mocks.  Evidently the (poorly implemented) == method caused issues
   # with RSpec Mock's internals.  I'm just double checking for any

data/test/spys_test.rb

@@ -93,7 +93,7 @@ class TestSpys < Test::Unit::TestCase
   def test_spy_accepts_correct_additional_validations
     @spy.foo(2)
     is_even = proc { |n| assert_equal 0, n%2 }
-    assert_spy_called @spy, { and: is_even }, :foo, Integer
+    assert_spy_called @spy, { :and => is_even }, :foo, Integer
   end
 
   def test_spy_accepts_multiple_additional_validations_first_failing
@@ -101,7 +101,7 @@ class TestSpys < Test::Unit::TestCase
     is_two  = proc { |n| assert_equal 2, n }
     is_even = proc { |n| assert_equal 0, n%2 }
     assert_failed(/2.*expected but was.*4/mi) do
-      assert_spy_called @spy, { and: [is_two, is_even] }, :foo, Integer
+      assert_spy_called @spy, { :and => [is_two, is_even] }, :foo, Integer
     end
   end
 
@@ -110,7 +110,7 @@ class TestSpys < Test::Unit::TestCase
     is_even = proc { |n| assert_equal 0, n%2 }
     is_two  = proc { |n| assert_equal 2, n }
     assert_failed(/2.*expected but was.*4/mi) do
-      assert_spy_called @spy, { and: [is_even, is_two] }, :foo, Integer
+      assert_spy_called @spy, { :and => [is_even, is_two] }, :foo, Integer
     end
   end
 
@@ -118,7 +118,7 @@ class TestSpys < Test::Unit::TestCase
     @spy.foo(3)
     is_even = proc { |n| assert_equal 0, n%2 }
     assert_failed(/0.*expected but was.*1/mi) do
-      assert_spy_called @spy, { and: is_even }, :foo, Integer
+      assert_spy_called @spy, { :and => is_even }, :foo, Integer
     end
   end
 
@@ -128,7 +128,7 @@ class TestSpys < Test::Unit::TestCase
     @spy.foo(4)
     is_even = proc { |n| assert_equal 0, n%2 }
     assert_failed(/0.*expected but was.*1/mi) do
-      assert_spy_called @spy, { and: is_even, on: 2 }, :foo, Integer
+      assert_spy_called @spy, { :and => is_even, :on => 2 }, :foo, Integer
     end
   end
 
@@ -136,11 +136,11 @@ class TestSpys < Test::Unit::TestCase
     failed = false
     begin
       yield
-    rescue MiniTest::Assertion => ex
+    rescue assertion_failed_error => ex
       failed = true
       assert_match message_pattern, ex.message
     end
-    refute(!failed, "Expected block to fail")
+    assert(failed, "Expected block to fail")
   end
 
   def test_spy_methods_can_be_stubbed

data/test/test_setup.rb

@@ -15,7 +15,6 @@ class FlexMock
     # expected error message.
     def assert_failure(options={}, &block)
       message = options[:message]
-      no_location = options[:no_location]
       ex = assert_raises(assertion_failed_error) { yield }
       if message
         case message
@@ -54,9 +53,10 @@ class FlexMock
         loc_re = Regexp.compile(Regexp.quote(file))
       end
 
+
       if search_all
         bts = ex.backtrace.join("\n")
-        assert_block("expected a backtrace line to match #{loc_re}\nBACKTRACE:\n#{bts}") {
+        assert_with_block("expected a backtrace line to match #{loc_re}\nBACKTRACE:\n#{bts}") {
           ex.backtrace.any? { |bt| loc_re =~ bt }
         }
       else
@@ -65,5 +65,11 @@ class FlexMock
 
       ex
     end
+
+    def assert_with_block(msg=nil)
+      unless yield
+        assert(false, msg || "Expected block to yield true")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies: []
 description: ! "\n      FlexMock is a extremely simple mock object class compatible\n
   \     with the Test::Unit framework.  Although the FlexMock's\n      interface is
@@ -21,6 +21,8 @@ extra_rdoc_files:
 - doc/index.rdoc
 - CHANGES
 - doc/GoogleExample.rdoc
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
 - doc/releases/flexmock-0.4.2.rdoc
@@ -46,15 +48,15 @@ extra_rdoc_files:
 - doc/releases/flexmock-1.1.0.rdoc
 - doc/releases/flexmock-1.2.0.rdoc
 - doc/releases/flexmock-1.3.0.rdoc
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
+- doc/releases/flexmock-1.3.1.rdoc
 files:
 - CHANGES
 - Gemfile
 - Gemfile.lock
-- Rakefile
 - README.md
+- Rakefile
 - TAGS
+- lib/flexmock.rb
 - lib/flexmock/argument_matchers.rb
 - lib/flexmock/argument_matching.rb
 - lib/flexmock/argument_types.rb
@@ -74,11 +76,11 @@ files:
 - lib/flexmock/object_extensions.rb
 - lib/flexmock/ordering.rb
 - lib/flexmock/partial_mock.rb
-- lib/flexmock/rails/view_mocking.rb
 - lib/flexmock/rails.rb
+- lib/flexmock/rails/view_mocking.rb
 - lib/flexmock/recorder.rb
-- lib/flexmock/rspec/configure.rb
 - lib/flexmock/rspec.rb
+- lib/flexmock/rspec/configure.rb
 - lib/flexmock/rspec_spy_matcher.rb
 - lib/flexmock/spy_describers.rb
 - lib/flexmock/symbol_extensions.rb
@@ -88,10 +90,10 @@ files:
 - lib/flexmock/undefined.rb
 - lib/flexmock/validators.rb
 - lib/flexmock/version.rb
-- lib/flexmock.rb
 - test/aliasing_test.rb
 - test/assert_spy_called_test.rb
 - test/base_class_test.rb
+- test/based_partials_test.rb
 - test/container_methods_test.rb
 - test/default_framework_adapter_test.rb
 - test/demeter_mocking_test.rb
@@ -123,6 +125,8 @@ files:
 - install.rb
 - doc/index.rdoc
 - doc/GoogleExample.rdoc
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
 - doc/releases/flexmock-0.4.2.rdoc
@@ -148,8 +152,7 @@ files:
 - doc/releases/flexmock-1.1.0.rdoc
 - doc/releases/flexmock-1.2.0.rdoc
 - doc/releases/flexmock-1.3.0.rdoc
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
+- doc/releases/flexmock-1.3.1.rdoc
 homepage: https://github.com/jimweirich/flexmock
 licenses: []
 post_install_message: 
@@ -167,9 +170,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2506978520909989178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: