aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-28 18:25:02 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-28 18:25:02 -0600
commitcbefcc88b38f0ec3c885b450962623017f4cc64c (patch)
tree97f4f767029157a20dfccf62cfc93d1c4816cc11 /actionpack
parentf0fe555d842e7b81b323ed3acfd551f0659c5faa (diff)
downloadrails-cbefcc88b38f0ec3c885b450962623017f4cc64c.tar.gz
rails-cbefcc88b38f0ec3c885b450962623017f4cc64c.tar.bz2
rails-cbefcc88b38f0ec3c885b450962623017f4cc64c.zip
add activesupport and activemodel load paths to actionpack tests
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract_unit.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 7bcaf0a5eb..660cabc554 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,5 +1,11 @@
require File.expand_path('../../../load_paths', __FILE__)
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
+activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
+$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
+
$:.unshift(File.dirname(__FILE__) + '/lib')
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')