Merge branch 'master' of git@github.com:rails/rails

10 files changed, 3 insertions, 18 deletions

diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index a79278159d..ed8c4427c9 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -9,9 +9,10 @@ require 'controller/fake_controllers'
 
 unless defined?(ActionMailer)
   begin
-    $:.unshift(File.dirname(__FILE__) + "/../../../actionmailer/lib")
+    $:.unshift("#{File.dirname(__FILE__)}/../../../actionmailer/lib")
     require 'action_mailer'
-  rescue LoadError
+  rescue LoadError => e
+    raise unless e.message =~ /action_mailer/
     require 'rubygems'
     gem 'actionmailer'
   end
diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb
index 87fbf1a4cd..ac1c8abc59 100644
--- a/actionpack/test/controller/cgi_test.rb
+++ b/actionpack/test/controller/cgi_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/cgi_process'
 
 class BaseCgiTest < Test::Unit::TestCase
   def setup
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 3ee78a6156..61bfb2b6e9 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -2,8 +2,6 @@ require 'abstract_unit'
 
 uses_mocha 'dispatcher tests' do
 
-require 'action_controller/dispatcher'
-
 class DispatcherTest < Test::Unit::TestCase
   Dispatcher = ActionController::Dispatcher
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 7e4c3e171a..b39d35930d 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,6 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/integration'
-require 'action_controller/routing'
 
 uses_mocha 'integration' do
 
diff --git a/actionpack/test/controller/integration_upload_test.rb b/actionpack/test/controller/integration_upload_test.rb
index 4af9b7e697..b1dd6a6341 100644
--- a/actionpack/test/controller/integration_upload_test.rb
+++ b/actionpack/test/controller/integration_upload_test.rb
@@ -1,6 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/integration'
-require 'action_controller/routing'
 
 unless defined? ApplicationController
   class ApplicationController < ActionController::Base
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index d5e56b9584..7e8b0f9bf2 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/rack_process'
 
 class BaseRackTest < Test::Unit::TestCase
   def setup
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 7e264289e6..316a203e97 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/integration'
 
 class RequestTest < ActiveSupport::TestCase
   def setup
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index b8a143cfd9..d62c7a1743 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/routing'
 
 class MilestonesController < ActionController::Base
   def index() head :ok end
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
index 52c1f7559c..b5f14acc1f 100644
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ b/actionpack/test/controller/session/cookie_store_test.rb
@@ -1,7 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/cgi_process'
-require 'action_controller/cgi_ext'
-
 require 'stringio'
 
 
diff --git a/actionpack/test/controller/session/mem_cache_store_test.rb b/actionpack/test/controller/session/mem_cache_store_test.rb
index a7d48431f8..9ab927a01f 100644
--- a/actionpack/test/controller/session/mem_cache_store_test.rb
+++ b/actionpack/test/controller/session/mem_cache_store_test.rb
@@ -1,7 +1,4 @@
 require 'abstract_unit'
-require 'action_controller/cgi_process'
-require 'action_controller/cgi_ext'
-
 
 class CGI::Session
   def cache