mocha 1.0.0.alpha → 1.10.0.alpha

data/test/acceptance/stubbing_method_unnecessarily_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingMethodUnnecessarilyTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_unnecessarily
-    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :allow }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -24,7 +23,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_method_unnecessarily
-    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :warn }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -34,7 +33,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_method_unnecessarily
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -53,7 +52,7 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_when_stubbed_method_is_invoked
-    Mocha::Configuration.prevent(:stubbing_method_unnecessarily)
+    Mocha.configure { |c| c.stubbing_method_unnecessarily = :prevent }
     test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:public_method)
@@ -61,5 +60,4 @@ class StubbingMethodUnnecessarilyTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_nil_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNilTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -13,47 +12,49 @@ class StubbingNilTest < Mocha::TestCase
     teardown_acceptance_test
   end
 
-  def test_should_allow_stubbing_method_on_nil
-    Mocha::Configuration.allow(:stubbing_method_on_nil)
-    test_result = run_as_test do
-      nil.stubs(:stubbed_method)
+  if RUBY_VERSION < '2.2.0'
+    def test_should_allow_stubbing_method_on_nil
+      Mocha.configure { |c| c.stubbing_method_on_nil = :allow }
+      test_result = run_as_test do
+        nil.stubs(:stubbed_method)
+      end
+      assert_passed(test_result)
+      assert !@logger.warnings.include?('stubbing method on nil: nil.stubbed_method')
     end
-    assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
-  end
 
-  def test_should_warn_on_stubbing_method_on_nil
-    Mocha::Configuration.warn_when(:stubbing_method_on_nil)
-    test_result = run_as_test do
-      nil.stubs(:stubbed_method)
+    def test_should_warn_on_stubbing_method_on_nil
+      Mocha.configure { |c| c.stubbing_method_on_nil = :warn }
+      test_result = run_as_test do
+        nil.stubs(:stubbed_method)
+      end
+      assert_passed(test_result)
+      assert @logger.warnings.include?('stubbing method on nil: nil.stubbed_method')
     end
-    assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
-  end
 
-  def test_should_prevent_stubbing_method_on_nil
-    Mocha::Configuration.prevent(:stubbing_method_on_nil)
-    test_result = run_as_test do
-      nil.stubs(:stubbed_method)
+    def test_should_prevent_stubbing_method_on_nil
+      Mocha.configure { |c| c.stubbing_method_on_nil = :prevent }
+      test_result = run_as_test do
+        nil.stubs(:stubbed_method)
+      end
+      assert_failed(test_result)
+      assert test_result.error_messages.include?('Mocha::StubbingError: stubbing method on nil: nil.stubbed_method')
     end
-    assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
-  end
 
-  def test_should_default_to_prevent_stubbing_method_on_non_mock_object
-    test_result = run_as_test do
-      nil.stubs(:stubbed_method)
+    def test_should_default_to_prevent_stubbing_method_on_non_mock_object
+      test_result = run_as_test do
+        nil.stubs(:stubbed_method)
+      end
+      assert_failed(test_result)
+      assert test_result.error_messages.include?('Mocha::StubbingError: stubbing method on nil: nil.stubbed_method')
     end
-    assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
-  end
 
-  def test_should_allow_stubbing_method_on_non_nil_object
-    Mocha::Configuration.prevent(:stubbing_method_on_nil)
-    object = Object.new
-    test_result = run_as_test do
-      object.stubs(:stubbed_method)
+    def test_should_allow_stubbing_method_on_non_nil_object
+      Mocha.configure { |c| c.stubbing_method_on_nil = :prevent }
+      object = Object.new
+      test_result = run_as_test do
+        object.stubs(:stubbed_method)
+      end
+      assert_passed(test_result)
     end
-    assert_passed(test_result)
   end
 end

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_non_existent_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new
     test_result = run_as_test do
       klass.any_instance.stubs(:non_existent_method)
@@ -53,7 +52,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -64,8 +63,21 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  def test_should_allow_stubbing_method_to_which_any_instance_responds
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
+    klass = Class.new do
+      def respond_to?(method, _include_private = false)
+        (method == :method_to_which_instance_responds)
+      end
+    end
+    test_result = run_as_test do
+      klass.any_instance.stubs(:method_to_which_instance_responds)
+    end
+    assert_passed(test_result)
+  end
+
   def test_should_allow_stubbing_existing_protected_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -77,7 +89,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_any_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -89,7 +101,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -102,7 +114,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -115,7 +127,7 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_any_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -126,5 +138,4 @@ class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end

data/test/acceptance/stubbing_non_existent_class_method_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentClassMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_non_existent_class_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_non_existent_class_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_non_existent_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new
     test_result = run_as_test do
       klass.stubs(:non_existent_method)
@@ -52,8 +51,9 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     assert_passed(test_result)
   end
 
+  # rubocop:disable Lint/DuplicateMethods
   def test_should_allow_stubbing_existing_public_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_public_method; end
@@ -67,10 +67,10 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_to_which_class_responds
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
-        def respond_to?(method, include_private = false)
+        def respond_to?(method, _include_private = false)
           (method == :method_to_which_class_responds)
         end
       end
@@ -82,7 +82,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_protected_method; end
@@ -96,7 +96,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_class_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       class << self
         def existing_private_method; end
@@ -110,7 +110,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_public_method; end
@@ -125,7 +125,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_protected_method; end
@@ -140,7 +140,7 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       class << self
         def existing_private_method; end
@@ -153,5 +153,5 @@ class StubbingNonExistentClassMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
+  # rubocop:enable Lint/DuplicateMethods
 end

data/test/acceptance/stubbing_non_existent_instance_method_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha/setup'
+require 'mocha/configuration'
 
 class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
-
   include AcceptanceTest
 
   def setup
@@ -14,7 +13,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_non_existent_instance_method
-    Mocha::Configuration.allow(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :allow }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -24,7 +23,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_warn_when_stubbing_non_existent_instance_method
-    Mocha::Configuration.warn_when(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :warn }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -34,7 +33,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_prevent_stubbing_non_existent_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     instance = Class.new.new
     test_result = run_as_test do
       instance.stubs(:non_existent_method)
@@ -53,7 +52,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -66,9 +65,9 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_method_to_which_instance_responds
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
-      def respond_to?(method, include_private = false)
+      def respond_to?(method, _include_private = false)
         (method == :method_to_which_instance_responds)
       end
     end
@@ -80,7 +79,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -93,7 +92,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_instance_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     klass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -106,7 +105,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_public_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_public_method; end
       public :existing_public_method
@@ -119,7 +118,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_protected_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_protected_method; end
       protected :existing_protected_method
@@ -132,7 +131,7 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
   end
 
   def test_should_allow_stubbing_existing_private_instance_superclass_method
-    Mocha::Configuration.prevent(:stubbing_non_existent_method)
+    Mocha.configure { |c| c.stubbing_non_existent_method = :prevent }
     superklass = Class.new do
       def existing_private_method; end
       private :existing_private_method
@@ -143,5 +142,4 @@ class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
     end
     assert_passed(test_result)
   end
-
 end