minitest-rspec_mocks 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec555958f3d7d82a5d2b7363c3d09737aff2f781
-  data.tar.gz: 580ed80295ccbf05b31614d650345976f870d654
+  metadata.gz: 5688818ab7c483bc82c1b576c62c3e430c2a5538
+  data.tar.gz: 5171b53c75b39ef72dabd6f8ad5429cc8f5f28c7
 SHA512:
-  metadata.gz: bba4f1199b2bbb5b9c8d0c4002033ba8538df01b7c0cb211a51a9557b9017d8e978f27f0a6ff20280e7714ce8c56746861c815932383390b43ee7256425fb153
-  data.tar.gz: c213daf0809d295b6c598d34151c49914834f6bba4a53b3d096dc0feba343ffeae6dc5a92007c91c4b57ee1a411b5eab4ea56333fcfbfdbc4e1dbf4dccf3e249
+  metadata.gz: 06f55f50c10465979366edc5715509bf9319912eb4cf23d781e3ebd6b2454ede20c29ce413b05b9803dbd245ff2cf119c4bd7befa6d659a947f075ff8ced11eb
+  data.tar.gz: 09d4333f951a507b1450b0ac98b1501c5dcf5ecb5e0bf3b5616583987c6cd96dabbc838b0fa1e6da11c73c095ec5493c8795ee33a5c3a4212f77f7bcceff4fd2

data/lib/minitest/rspec_mocks.rb

@@ -4,9 +4,23 @@ require_relative './rspec_mocks/version'
 
 class Object
   # remove Minitest's stub method so RSpec's version on BasicObject will work
-  if self.method_defined?(:stub) && !defined?(removed_minitest)
+  if self.method_defined?(:stub) && !defined?(removed_minitest_stub)
     remove_method :stub
-    removed_minitest = true
+    removed_minitest_stub = true
+    removed_minitest_stub
+  end
+end
+
+class Minitest::Spec
+  module DSL
+    module InstanceMethods
+      # remove Minitest's stub method so RSpec's version on BasicObject will work
+      if self.method_defined?(:expect) && !defined?(removed_minitest_expect)
+        remove_method :expect
+        removed_minitest_expect = true
+        removed_minitest_expect
+      end
+    end
   end
 end
 

data/lib/minitest/rspec_mocks/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module RSpecMocks
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/test/minitest/rspec_mocks_test.rb

@@ -8,24 +8,9 @@ base_class = if MiniTest.const_defined?(:Unit)
                Minitest::Test
              end
 
-class TestBase < base_class
-  include Minitest::RSpecMocks
-end
-
-# I am not sure how/if this test ever passed. We remove minitest stub 
-# when we require minitest_spec_mocks, so it doesn't make sense to 
-# have this test. 
-#
-# class MiniTestWithoutRspecMocksTest < MiniTest::Unit::TestCase
-#   def test_it_should_use_minitest_stub
-#     string = "hello"
-#     string.stub(:to_i, 100) do
-#       assert string.to_i == 100
-#     end
-#   end
-# end
+base_class.send :include, Minitest::RSpecMocks
 
-class MiniTestWithRspecMocksShouldStyleTest < TestBase
+class MiniTestWithRspecMocksShouldStyleTest < base_class
   def test_it_should_use_rspec_stub
     RSpec::Mocks.configuration.syntax = :should
     string = "hello"
@@ -35,7 +20,7 @@ class MiniTestWithRspecMocksShouldStyleTest < TestBase
   end
 end
 
-class MiniTestWithRspecMocksExpectStyleTest < TestBase
+class MiniTestWithRspecMocksExpectStyleTest < base_class
   def test_it_should_use_rspec_expect
     RSpec::Mocks.configuration.syntax = :expect
     string = "hello"
@@ -44,3 +29,21 @@ class MiniTestWithRspecMocksExpectStyleTest < TestBase
     assert string.to_i == 100
   end
 end
+
+describe 'when used with minitest/spec syntax' do
+  it 'works with stub syntax' do
+    RSpec::Mocks.configuration.syntax = :should
+    string = "hello"
+    assert string.to_i == 0
+    string.stub(to_i: 100)
+    assert string.to_i == 100
+  end
+
+  it 'works with expect syntax' do
+    RSpec::Mocks.configuration.syntax = :expect
+    string = "hello"
+    assert string.to_i == 0
+    expect(string).to receive(:to_i).and_return 100
+    assert string.to_i == 100
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rspec_mocks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sammy Larbi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Use rspec-mocks with minitest