better location for requires

rspec · Jul 3, 2010 · 092f785 · 092f785
1 parent 3eff88d
commit 092f785
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/lib/rspec/mocks.rb b/lib/rspec/mocks.rb
@@ -1,5 +1,5 @@
 require 'rspec/mocks/framework'
-require 'rspec/mocks/extensions/object'
+require 'rspec/mocks/extensions'
 require 'rspec/mocks/version'
 
 module RSpec

diff --git a/lib/rspec/mocks/extensions.rb b/lib/rspec/mocks/extensions.rb
@@ -1 +1,2 @@
 require 'rspec/mocks/extensions/object'
+require 'rspec/mocks/extensions/instance_exec'
diff --git a/lib/rspec/mocks/message_expectation.rb b/lib/rspec/mocks/message_expectation.rb
@@ -88,7 +88,6 @@ def and_yield(*args, &block)
         end
 
         if block
-          require 'rspec/mocks/extensions/instance_exec'
           @eval_context = Object.new
           @eval_context.extend RSpec::Mocks::InstanceExec
           yield @eval_context