mocha 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1a4df2eb13604de6b309bc453307d375c055620
-  data.tar.gz: 9144ebfe812beea562fc8c9ebdfb87326cb5ffa6
+  metadata.gz: ae952b50093776beef6c7083184899e6875738d7
+  data.tar.gz: b45fc4c6fe7d7ab128a7227f3fdf2db01e349989
 SHA512:
-  metadata.gz: 1cf5b923bb4a91c6b3a1dac90aca3084229955743ae64c41cbecf561e8fd572f419d09d155ff3c9b6d0616258ca526d70677d79f9861e8987f99ee5b312bbb90
-  data.tar.gz: 9e635e0f0897d0437acffe0cfe4755ecae028da76513445a5b4b56ee48be878ae0070fa24d3fc8bddad02a69d790223909b936fdcdb6f53114feeec8c69cd3c4
+  metadata.gz: c5ca31997f0e6342f4d757a4a42da220cbc51878b878b48f61b4d74b095f7347a846c6196f65568c4dde737c8ccbe13e15eba3fce25054d5232724535021a1b3
+  data.tar.gz: b8797e8b7e3a58b31e3f773860989aafc85fabd2cbf4529a965b521e7ec1f995304b26186f49062c6ec8af6b8b4749730e89373ebf1e909df1b7e7fb5ca793a1

data/RELEASE.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.5.0
+
+* Prevent use of Mocha outside the context of a test/example - thanks to @andyw8 & @lzap (#327)
+
 ## 1.4.0
 
 * Fix deprecation warning for `assert_nil` in `ClassMethodTest` (#308 & #309)

data/lib/mocha/central.rb

@@ -2,6 +2,23 @@ module Mocha
 
   class Central
 
+    class Null < self
+
+      def initialize(&block)
+        super
+        @raise_not_initialized_error = block
+      end
+
+      def stub(*)
+        @raise_not_initialized_error.call
+      end
+
+      def unstub(*)
+        @raise_not_initialized_error.call
+      end
+
+    end
+
     attr_accessor :stubba_methods
 
     def initialize

data/lib/mocha/error_with_filtered_backtrace.rb

@@ -0,0 +1,17 @@
+require 'mocha/backtrace_filter'
+
+module Mocha
+
+  # @private
+  class ErrorWithFilteredBacktrace < StandardError
+
+    # @private
+    def initialize(message = nil, backtrace = [])
+      super(message)
+      filter = BacktraceFilter.new
+      set_backtrace(filter.filtered(backtrace))
+    end
+
+  end
+
+end

data/lib/mocha/hooks.rb

@@ -21,6 +21,7 @@ module Mocha
     #
     # This method should be called before each individual test starts (including before any "setup" code).
     def mocha_setup
+      Mockery.setup
     end
 
     # Verifies that all mock expectations have been met (only for use by authors of test libraries).
@@ -37,8 +38,6 @@ module Mocha
     # This method should be called after each individual test has finished (including after any "teardown" code).
     def mocha_teardown
       Mockery.teardown
-    ensure
-      Mockery.reset_instance
     end
   end
 end

data/lib/mocha/integration/mini_test/version_13.rb

@@ -25,6 +25,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.name
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_140.rb

@@ -25,6 +25,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_141.rb

@@ -31,6 +31,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_142_to_172.rb

@@ -31,6 +31,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_200.rb

@@ -31,6 +31,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_201_to_222.rb

@@ -31,6 +31,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.__send__ self.__name__
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/mini_test/version_2110_to_2111.rb

@@ -32,6 +32,7 @@ module Mocha
               begin
                 @passed = nil
                 self.before_setup
+                mocha_setup
                 self.setup
                 self.after_setup
                 self.run_test self.__name__

data/lib/mocha/integration/mini_test/version_2112_to_320.rb

@@ -35,6 +35,7 @@ module Mocha
               begin
                 @passed = nil
                 self.before_setup
+                mocha_setup
                 self.setup
                 self.after_setup
                 self.run_test self.__name__

data/lib/mocha/integration/mini_test/version_230_to_2101.rb

@@ -31,6 +31,7 @@ module Mocha
             begin
               begin
                 @passed = nil
+                mocha_setup
                 self.setup
                 self.run_setup_hooks
                 self.__send__ self.__name__

data/lib/mocha/integration/test_unit/gem_version_200.rb

@@ -26,6 +26,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   __send__(@method_name)
                   mocha_verify(assertion_counter)

data/lib/mocha/integration/test_unit/gem_version_201_to_202.rb

@@ -26,6 +26,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   mocha_verify(assertion_counter)

data/lib/mocha/integration/test_unit/gem_version_203_to_220.rb

@@ -26,6 +26,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED, name)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   mocha_verify(assertion_counter)

data/lib/mocha/integration/test_unit/gem_version_230_to_250.rb

@@ -28,6 +28,7 @@ module Mocha
               yield(Test::Unit::TestCase::STARTED_OBJECT, self)
               begin
                 begin
+                  mocha_setup
                   run_setup
                   run_test
                   run_cleanup

data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb

@@ -25,6 +25,7 @@ module Mocha
             @_result = result
             begin
               begin
+                mocha_setup
                 setup
                 __send__(@method_name)
                 mocha_verify(assertion_counter)

data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb

@@ -25,6 +25,7 @@ module Mocha
             @_result = result
             begin
               begin
+                mocha_setup
                 setup
                 __send__(@method_name)
                 mocha_verify(assertion_counter)

data/lib/mocha/mockery.rb

@@ -7,16 +7,46 @@ require 'mocha/state_machine'
 require 'mocha/logger'
 require 'mocha/configuration'
 require 'mocha/stubbing_error'
+require 'mocha/not_initialized_error'
 require 'mocha/expectation_error_factory'
 
 module Mocha
 
   class Mockery
 
+    class Null < self
+
+      def add_mock(*)
+        raise_not_initialized_error
+      end
+
+      def add_state_machine(*)
+        raise_not_initialized_error
+      end
+
+      def stubba
+        Central::Null.new(&method(:raise_not_initialized_error))
+      end
+
+      private
+
+      def raise_not_initialized_error
+        message = 'Mocha methods cannot be used outside the context of a test'
+        raise NotInitializedError.new(message, caller)
+      end
+
+    end
+
     class << self
 
       def instance
-        @instance ||= new
+        instances.last || Null.new
+      end
+
+      def setup
+        mockery = new
+        mockery.logger = instance.logger unless instances.empty?
+        @instances.push(mockery)
       end
 
       def verify(*args)
@@ -25,10 +55,15 @@ module Mocha
 
       def teardown
         instance.teardown
+      ensure
+        @instances.pop
+        @instances = nil if instances.empty?
       end
 
-      def reset_instance
-        @instance = nil
+      private
+
+      def instances
+        @instances ||= []
       end
 
     end

data/lib/mocha/not_initialized_error.rb

@@ -0,0 +1,9 @@
+require 'mocha/error_with_filtered_backtrace'
+
+module Mocha
+
+  # Exception raised when Mocha has not been initialized, e.g. outside the
+  # context of a test.
+  class NotInitializedError < ErrorWithFilteredBacktrace; end
+
+end

data/lib/mocha/stubbing_error.rb

@@ -1,19 +1,10 @@
-require 'mocha/backtrace_filter'
+require 'mocha/error_with_filtered_backtrace'
 
 module Mocha
 
   # Exception raised when stubbing a particular method is not allowed.
   #
   # @see Configuration.prevent
-  class StubbingError < StandardError
-
-    # @private
-    def initialize(message = nil, backtrace = [])
-      super(message)
-      filter = BacktraceFilter.new
-      set_backtrace(filter.filtered(backtrace))
-    end
-
-  end
+  class StubbingError < ErrorWithFilteredBacktrace; end
 
 end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/acceptance/acceptance_test_helper.rb

@@ -27,13 +27,11 @@ module AcceptanceTest
     Mocha::Configuration.reset_configuration
     @logger = FakeLogger.new
     mockery = Mocha::Mockery.instance
-    @original_logger = mockery.logger
     mockery.logger = @logger
   end
 
   def teardown_acceptance_test
     Mocha::Configuration.reset_configuration
-    Mocha::Mockery.instance.logger = @original_logger
   end
 
   include Introspection::Assertions

data/test/acceptance/prevent_use_of_mocha_outside_test_test.rb

@@ -0,0 +1,79 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha/setup'
+require 'mocha/not_initialized_error'
+
+class PreventUseOfMochaOutsideTestTest < Mocha::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+    mocha_teardown
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_should_raise_exception_when_mock_called_outside_test
+    assert_raises(Mocha::NotInitializedError) { mock('object') }
+  end
+
+  def test_should_raise_exception_when_stub_called_outside_test
+    assert_raises(Mocha::NotInitializedError) { stub('object') }
+  end
+
+  def test_should_raise_exception_when_stub_everything_called_outside_test
+    assert_raises(Mocha::NotInitializedError) { stub_everything('object') }
+  end
+
+  def test_should_raise_exception_when_states_called_outside_test
+    assert_raises(Mocha::NotInitializedError) { states('state-machine') }
+  end
+
+  def test_should_raise_exception_when_expects_called_on_instance_outside_test
+    instance = Class.new.new
+    assert_raises(Mocha::NotInitializedError) { instance.expects(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_expects_called_on_class_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.expects(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_expects_called_on_any_instance_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.any_instance.expects(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_stubs_called_on_instance_outside_test
+    instance = Class.new.new
+    assert_raises(Mocha::NotInitializedError) { instance.stubs(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_stubs_called_on_class_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.stubs(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_stubs_called_on_any_instance_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.any_instance.stubs(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_unstub_called_on_instance_outside_test
+    instance = Class.new.new
+    assert_raises(Mocha::NotInitializedError) { instance.unstub(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_unstub_called_on_class_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.unstub(:expected_method) }
+  end
+
+  def test_should_raise_exception_when_unstub_called_on_any_instance_outside_test
+    klass = Class.new
+    assert_raises(Mocha::NotInitializedError) { klass.any_instance.unstub(:expected_method) }
+  end
+
+end

data/test/unit/hooks_test.rb

@@ -1,10 +1,11 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/hooks'
+require 'mocha/mockery'
 
 class HooksTest < Mocha::TestCase
   class Mocha::Mockery
     class << self
-      attr_writer :instance
+      attr_writer :instances
     end
   end
 
@@ -19,11 +20,11 @@ class HooksTest < Mocha::TestCase
 
   def test_ensure_mockery_instance_is_reset_even_when_an_exception_is_raised_in_mockery_teardown
     fake_test_case = Object.new.extend(Mocha::Hooks)
-    original_mockery = FakeMockery.new
-    Mocha::Mockery.instance = original_mockery
+    mockery = FakeMockery.new
+    Mocha::Mockery.instances = [mockery]
 
     fake_test_case.mocha_teardown rescue nil
 
-    assert_not_same Mocha::Mockery.instance, original_mockery
+    assert_kind_of Mocha::Mockery::Null, Mocha::Mockery.instance
   end
 end

data/test/unit/mockery_test.rb

@@ -9,7 +9,22 @@ class MockeryTest < Mocha::TestCase
   include Mocha
   include DeprecationDisabler
 
-  def test_should_build_instance_of_mockery
+  def setup
+    Mockery.setup
+  end
+
+  def teardown
+    Mockery.teardown
+  end
+
+  def test_should_return_null_mockery_if_not_setup
+    Mockery.teardown
+    mockery = Mockery.instance
+    assert_not_nil mockery
+    assert_kind_of Mockery::Null, mockery
+  end
+
+  def test_should_return_instance_of_mockery
     mockery = Mockery.instance
     assert_not_nil mockery
     assert_kind_of Mockery, mockery
@@ -23,7 +38,7 @@ class MockeryTest < Mocha::TestCase
 
   def test_should_expire_mockery_instance_cache
     mockery_1 = Mockery.instance
-    Mockery.reset_instance
+    Mockery.teardown
     mockery_2 = Mockery.instance
     assert_not_same mockery_1, mockery_2
   end

data/test/unit/object_methods_test.rb

@@ -1,14 +1,20 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/object_methods'
+require 'mocha/mockery'
 require 'mocha/mock'
 require 'mocha/expectation_error_factory'
 
 class ObjectMethodsTest < Mocha::TestCase
 
   def setup
+    Mocha::Mockery.setup
     @object = Object.new.extend(Mocha::ObjectMethods)
   end
 
+  def teardown
+    Mocha::Mockery.teardown
+  end
+
   def test_should_build_mocha_referring_to_self
     mocha = @object.mocha
     assert_not_nil mocha

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
@@ -141,6 +141,7 @@ files:
 - lib/mocha/deprecation.rb
 - lib/mocha/detection/mini_test.rb
 - lib/mocha/detection/test_unit.rb
+- lib/mocha/error_with_filtered_backtrace.rb
 - lib/mocha/exception_raiser.rb
 - lib/mocha/expectation.rb
 - lib/mocha/expectation_error.rb
@@ -187,6 +188,7 @@ files:
 - lib/mocha/multiple_yields.rb
 - lib/mocha/names.rb
 - lib/mocha/no_yields.rb
+- lib/mocha/not_initialized_error.rb
 - lib/mocha/object_methods.rb
 - lib/mocha/parameter_matchers.rb
 - lib/mocha/parameter_matchers/all_of.rb
@@ -250,6 +252,7 @@ files:
 - test/acceptance/parameter_matcher_test.rb
 - test/acceptance/partial_mocks_test.rb
 - test/acceptance/prepend_test.rb
+- test/acceptance/prevent_use_of_mocha_outside_test_test.rb
 - test/acceptance/raise_exception_test.rb
 - test/acceptance/return_value_test.rb
 - test/acceptance/sequence_test.rb