flexmock 1.3.1 → 1.3.2

data/Gemfile

@@ -5,10 +5,3 @@ gem 'rake', ">= 0.9.2.2"
 group 'test' do
   gem 'rspec', ">= 2.0"
 end
-
-group 'dev' do
-  gem 'rdoc'
-  gem 'flog'
-  gem 'flay'
-  gem 'ghpreview'
-end

data/Gemfile.lock

@@ -1,80 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    blankslate (3.1.2)
-    charlock_holmes (0.6.9)
-    diff-lcs (1.1.3)
-    escape_utils (0.2.4)
-    ffi (1.0.11)
-    flay (2.1.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
-    flog (3.2.2)
-      ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.0)
-    gemoji (1.4.0)
-    ghpreview (0.0.6)
-      github-linguist (= 2.1)
-      html-pipeline (= 0.0.6)
-      httpclient
-      listen
-      rb-fsevent
-    github-linguist (2.1.0)
-      charlock_holmes (~> 0.6.6)
-      escape_utils (~> 0.2.3)
-      mime-types (~> 1.18)
-      pygments.rb (~> 0.2.13)
-    github-markdown (0.5.3)
-    html-pipeline (0.0.6)
-      activesupport (>= 2)
-      escape_utils (~> 0.2)
-      gemoji (~> 1.0)
-      github-linguist (~> 2.1)
-      github-markdown (~> 0.5)
-      nokogiri (~> 1.4)
-      rinku (~> 1.7)
-      sanitize (~> 2.0)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    json (1.7.7)
-    listen (0.7.2)
-    mime-types (1.21)
-    multi_json (1.6.1)
-    nokogiri (1.5.6)
-    pygments.rb (0.2.13)
-      rubypython (~> 0.5.3)
-    rake (10.0.3)
-    rb-fsevent (0.9.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    rinku (1.7.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    ruby_parser (3.1.1)
-      sexp_processor (~> 4.1)
-    rubypython (0.5.3)
-      blankslate (>= 2.1.2.3)
-      ffi (~> 1.0.7)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sexp_processor (4.1.5)
+    diff-lcs (1.2.4)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  flay
-  flog
-  ghpreview
   rake (>= 0.9.2.2)
-  rdoc
   rspec (>= 2.0)

data/Rakefile

@@ -44,7 +44,7 @@ RDOC_FILES = FileList[
   'doc/**/*.rdoc',
 ] + EXAMPLE_DOC
 
-task :default => [:test_all, :rspec]
+task :default => [:test_all, :rspec, :testunit]
 task :test_all => [:test]
 task :test_units => [:test]
 task :ta => [:test_all]
@@ -58,10 +58,23 @@ Rake::TestTask.new do |t|
   t.warning = true
 end
 
-Rake::TestTask.new(:test_extended) do |t|
-  t.test_files = FileList['test/extended/*_test.rb']
-  t.verbose = true
-  t.warning = true
+module Configuration
+  def self.minitest?
+    require 'minitest/autorun'
+    return true
+  rescue Exception
+    return false
+  end
+end
+
+task :testunit do
+  files = FileList['test/test_unit_integration/*_test.rb']
+  if ! Configuration.minitest?
+    files = files.reject { |fn| fn =~ /minitest/ }
+  end
+  files.each do |file|
+    sh "ruby -Ilib:. #{file}"
+  end
 end
 
 task :rspec do

data/lib/flexmock/test_unit.rb

@@ -11,22 +11,41 @@
 
 require 'flexmock/test_unit_integration'
 
-module Test
-  module Unit
-    class TestCase
-      include FlexMock::ArgumentTypes
-      include FlexMock::MockContainer
+class FlexMock
+  module GenericTestCase
+    def self.define_extensions_on(klass)
+      klass.class_eval do
+        include FlexMock::ArgumentTypes
+        include FlexMock::MockContainer
 
-      # Alias the original teardown behavior for later use.
-      alias :flexmock_original_teardown :teardown
+        # Alias the original teardown behavior for later use.
+        alias :flexmock_original_teardown :teardown
 
-      # Teardown the test case, verifying any mocks that might have been
-      # defined in this test case.
-      def teardown
-        flexmock_teardown
-        flexmock_original_teardown
+        # Teardown the test case, verifying any mocks that might have been
+        # defined in this test case.
+        def teardown
+          flexmock_teardown
+          flexmock_original_teardown
+        end
       end
+    end
+  end
+end
 
+if defined?(MiniTest)
+  module MiniTest
+    class Unit
+      class TestCase
+        FlexMock::GenericTestCase.define_extensions_on(self)
+      end
+    end
+  end
+else
+  module Test
+    module Unit
+      class TestCase
+        FlexMock::GenericTestCase.define_extensions_on(self)
+      end
     end
   end
 end

data/lib/flexmock/version.rb

@@ -3,7 +3,7 @@ class FlexMock
     NUMBERS = [
       MAJOR = 1,
       MINOR = 3,
-      BUILD = 1,
+      BUILD = 2,
     ]
   end
 

data/test/default_framework_adapter_test.rb

@@ -22,11 +22,11 @@ class TestFlexmockDefaultFrameworkAdapter < Test::Unit::TestCase
     }
   end
 
-  def test_make_assertion_doesnt_raise_exception
+  def test_make_assertion_doesnt_raise_exception_when_making_assertion
     @adapter.make_assertion("failure message") { true }
   end
 
-  def test_make_assertion_doesnt_raise_exception
+  def test_make_assertion_doesnt_raise_exception_when_asserting_equal
     @adapter.assert_equal("a", "a", "no message")
   end
 

data/test/test_unit_integration/auto_test_unit_test.rb

@@ -16,7 +16,13 @@ require "flexmock/test_unit"
 
 class TestFlexmockTestUnit < Test::Unit::TestCase
   def teardown
-    super
+    failed = false
+    begin
+      super
+    rescue Exception => ex
+      failed = true
+    end
+    assert_equal @should_fail, failed, "Expected failed to be #{@should_fail}"
   end
 
   # This test should pass.
@@ -24,11 +30,13 @@ class TestFlexmockTestUnit < Test::Unit::TestCase
     m = flexmock("mock")
     m.should_receive(:hi).once
     m.hi
+    @should_fail = false
   end
 
   # This test should fail during teardown.
   def test_should_fail__mocks_are_auto_verified
     m = flexmock("mock")
     m.should_receive(:hi).once
+    @should_fail = true
   end
 end

data/test/test_unit_integration/minitest_teardown_test.rb

@@ -0,0 +1,14 @@
+require "minitest/autorun"
+require 'flexmock/test_unit'
+
+class SimpleTest < MiniTest::Unit::TestCase
+
+  # This validates that the minitest teardown method is properly
+  # aliased when using MiniTest.
+  #
+  # (see https://github.com/jimweirich/flexmock/issues/14).
+  #
+  def test_flexmock
+    flexmock()
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-05-07 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,8 +21,6 @@ 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
@@ -49,6 +47,8 @@ extra_rdoc_files:
 - doc/releases/flexmock-1.2.0.rdoc
 - doc/releases/flexmock-1.3.0.rdoc
 - doc/releases/flexmock-1.3.1.rdoc
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
 files:
 - CHANGES
 - Gemfile
@@ -119,14 +119,13 @@ files:
 - test/test_class_extensions.rb
 - test/test_setup.rb
 - test/test_unit_integration/auto_test_unit_test.rb
+- test/test_unit_integration/minitest_teardown_test.rb
 - test/tu_integration_test.rb
 - test/undefined_test.rb
 - flexmock.blurb
 - 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
@@ -153,6 +152,8 @@ files:
 - doc/releases/flexmock-1.2.0.rdoc
 - doc/releases/flexmock-1.3.0.rdoc
 - doc/releases/flexmock-1.3.1.rdoc
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
 homepage: https://github.com/jimweirich/flexmock
 licenses: []
 post_install_message: 
@@ -170,6 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1970361257981767370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: