aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-15 10:38:39 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-15 10:38:39 -0600
commit4419497e403387a3cc93c4c1a3b6a07314a85e43 (patch)
treeeaa0fb6688531b6a7c3579fba0d8806b1c01627a /activesupport
parenteec2d301d4ce9df9c71c1a5aa63053eb970b6818 (diff)
downloadrails-4419497e403387a3cc93c4c1a3b6a07314a85e43.tar.gz
rails-4419497e403387a3cc93c4c1a3b6a07314a85e43.tar.bz2
rails-4419497e403387a3cc93c4c1a3b6a07314a85e43.zip
Make sure AS test env doesn't have duplicate libs in load path
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/callback_inheritance_test.rb1
-rw-r--r--activesupport/test/callbacks_test.rb1
-rw-r--r--activesupport/test/load_paths_test.rb14
3 files changed, 14 insertions, 2 deletions
diff --git a/activesupport/test/callback_inheritance_test.rb b/activesupport/test/callback_inheritance_test.rb
index 2e978f01be..e74c64ba8d 100644
--- a/activesupport/test/callback_inheritance_test.rb
+++ b/activesupport/test/callback_inheritance_test.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_support'
class GrandParent
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb
index 11494e951e..3fb940ad3c 100644
--- a/activesupport/test/callbacks_test.rb
+++ b/activesupport/test/callbacks_test.rb
@@ -1,6 +1,5 @@
# require 'abstract_unit'
require 'test/unit'
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_support'
module CallbacksTest
diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb
new file mode 100644
index 0000000000..683ba3dd4e
--- /dev/null
+++ b/activesupport/test/load_paths_test.rb
@@ -0,0 +1,14 @@
+require 'abstract_unit'
+
+class LoadPathsTest < Test::Unit::TestCase
+ def test_uniq_load_paths
+ load_paths_count = $LOAD_PATH.inject({}) { |paths, path|
+ expanded_path = File.expand_path(path)
+ paths[expanded_path] ||= 0
+ paths[expanded_path] += 1
+ paths
+ }
+
+ assert_equal [], load_paths_count.select { |k, v| v > 1 }, $LOAD_PATH.inspect
+ end
+end