From 4419497e403387a3cc93c4c1a3b6a07314a85e43 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 15 Feb 2010 10:38:39 -0600
Subject: Make sure AS test env doesn't have duplicate libs in load path

---
 activesupport/test/callback_inheritance_test.rb |  1 -
 activesupport/test/callbacks_test.rb            |  1 -
 activesupport/test/load_paths_test.rb           | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 activesupport/test/load_paths_test.rb

(limited to 'activesupport')

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
-- 
cgit v1.2.3