Permalink
Browse files

Use bundled env for tests only

  • Loading branch information...
1 parent c9cd10c commit 27670363926ee341078aa69ae27204d7338037f5 @jeremy jeremy committed Oct 20, 2009
Showing with 13 additions and 14 deletions.
  1. +2 −4 activerecord/Gemfile
  2. +4 −9 activerecord/lib/active_record.rb
  3. +7 −1 activerecord/test/cases/helper.rb
@@ -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"
@@ -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'
@@ -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'

0 comments on commit 2767036

Please sign in to comment.