From 092f785286b47d817a10405bc903a2d124ef77dc Mon Sep 17 00:00:00 2001 From: David Chelimsky Date: Sat, 3 Jul 2010 09:34:09 -0500 Subject: [PATCH] better location for requires --- lib/rspec/mocks.rb | 2 +- lib/rspec/mocks/extensions.rb | 1 + lib/rspec/mocks/message_expectation.rb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rspec/mocks.rb b/lib/rspec/mocks.rb index b031087a4..ca25fc26c 100644 --- 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 index 95b416f1b..a578386a2 100644 --- 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 index 14a4f54fd..26af0cf98 100644 --- 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