github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-10 07:07:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use bundled env for tests only

Browse Source
This commit is contained in:
Jeremy Kemper
2009-10-19 19:00:48 -07:00
parent c9cd10c4fa
commit 2767036392
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/Gemfile
View File

@@ -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"

13
activerecord/lib/active_record.rb
View File

@@ -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'

8
activerecord/test/cases/helper.rb
View File

@@ -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'