From 98eb136d2cc464ea7530b73bd6d290475e88a768 Mon Sep 17 00:00:00 2001
From: Norman Clarke <norman@njclarke.com>
Date: Fri, 27 Apr 2012 12:05:11 -0300
Subject: [PATCH] We don't need linked_rails any more, use Bundler instead

---
 test/linked_rails.rb | 20 +-------------------
 test/test_helper.rb  |  2 ++
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/test/linked_rails.rb b/test/linked_rails.rb
index 3616c065..6840b32c 100644
--- a/test/linked_rails.rb
+++ b/test/linked_rails.rb
@@ -1,13 +1,3 @@
-# allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/rails'
-
-if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
-  puts "[ using linked Rails ]"
-  $:.unshift linked_rails + '/activesupport/lib'
-  $:.unshift linked_rails + '/actionpack/lib'
-  $:.unshift linked_rails + '/railties/lib'
-end
-require 'rubygems'
 require 'action_pack'
 require 'action_controller'
 require 'action_view'
@@ -31,12 +21,4 @@ else
   RAILS_ROOT = File.join(File.dirname(__FILE__), "../..")
 end
 
-ActionController::Base.logger = Logger.new(nil)
-
-# Load plugins from test/plugins.
-# This will only work with very basic plugins,
-# since we don't want to load the entirety of Rails.
-Dir[File.dirname(__FILE__) + '/plugins/*'].each do |plugin|
-  $: << plugin + '/lib'
-  eval(File.read(plugin + '/init.rb'))
-end
+ActionController::Base.logger = Logger.new(nil)
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c8c31d6c..3870b30b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,5 @@
+require 'rubygems'
+
 lib_dir = File.dirname(__FILE__) + '/../lib'
 require File.dirname(__FILE__) + '/linked_rails'