Use bundled env for tests only

rails · Oct 20, 2009 · 2767036 · 2767036
1 parent c9cd10c
commit 2767036
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/activerecord/Gemfile b/activerecord/Gemfile
@@ -3,8 +3,6 @@ sibling = "#{File.dirname(__FILE__)}/.."
 
 gem "activesupport", "3.0.pre", :vendored_at => "#{sibling}/activesupport"
 gem "activemodel", "3.0.pre", :vendored_at => "#{sibling}/activemodel"
-gem "arel", :git => "git://github.com/rails/arel.git", :branch => 'master'
+gem "arel", :git => "git://github.com/rails/arel.git"
 
-only :test do
-  gem "mocha"
-end
+gem "mocha"
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
@@ -21,16 +21,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
-if File.exist?("#{bundled}.rb")
-  require bundled
-else
-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  $:.unshift(activesupport_path) if File.directory?(activesupport_path)
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+$:.unshift(activesupport_path) if File.directory?(activesupport_path)
 
-  activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib"
-  $:.unshift(activemodel_path) if File.directory?(activemodel_path)
-end
+activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib"
+$:.unshift(activemodel_path) if File.directory?(activemodel_path)
 
 require 'active_support'
 require 'active_model'

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
@@ -1,5 +1,11 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+
+bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
+if File.exist?("#{bundled}.rb")
+  require bundled
+else
+  $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+end
 
 require 'config'