[WIP] Fail fast if mocking before setup

lib/mocha/hooks.rb

@@ -21,6 +21,7 @@ module Hooks
     #
     # This method should be called before each individual test starts (including before any "setup" code).
     def mocha_setup
+      Mockery.build_instance
     end
 
     # Verifies that all mock expectations have been met (only for use by authors of test libraries).

lib/mocha/mockery.rb

@@ -12,11 +12,30 @@
 module Mocha
 
   class Mockery
+    class Null
+      def method_missing(method_name, *args, &block)
+        if method_name == :raise
+          super
+        else
+          raise StubbingError.new('Mocking/stubbing outside of the per-test lifecycle is not supported.', caller)
+        end
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        (method != :raise) || super
+      end
+
+      # No ops - just to make acceptance tests pass
+      def verify(*args); end
+      def teardown; end
+      attr_writer :logger
+    end
 
     class << self
+      attr_reader :instance
 
-      def instance
-        @instance ||= new
+      def build_instance
+        @instance = new
       end
 
       def verify(*args)
@@ -28,11 +47,13 @@ def teardown
       end
 
       def reset_instance
-        @instance = nil
+        @instance = Null.new
       end
 
     end
 
+    reset_instance
+
     def named_mock(name, &block)
       add_mock(Mock.new(self, Name.new(name), &block))
     end

test/unit/mockery_test.rb

@@ -9,7 +9,15 @@ class MockeryTest < Mocha::TestCase
   include Mocha
   include DeprecationDisabler
 
+  def test_should_return_null_mockery_if_not_built
+    mockery = Mockery.reset_instance
+    mockery = Mockery.instance
+    assert_not_nil mockery
+    assert_kind_of Mockery::Null, mockery
+  end
+
   def test_should_build_instance_of_mockery
+    Mockery.build_instance
     mockery = Mockery.instance
     assert_not_nil mockery
     assert_kind_of Mockery, mockery

test/unit/object_methods_test.rb

@@ -2,10 +2,12 @@
 require 'mocha/object_methods'
 require 'mocha/mock'
 require 'mocha/expectation_error_factory'
+require 'mocha/mockery'
 
 class ObjectMethodsTest < Mocha::TestCase
 
   def setup
+    Mocha::Mockery.build_instance
     @object = Object.new.extend(Mocha::ObjectMethods)
   end