aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-03 23:17:13 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-03 23:17:13 +0000
commitaf61b9cdae52947c816c7452d796304463ab0a89 (patch)
treeb76ea010234a69ef441956830f7e593a2c099945 /actionpack
parent0f956d1d6d7afc7beaa9816815b43d2f9312eddf (diff)
downloadrails-af61b9cdae52947c816c7452d796304463ab0a89.tar.gz
rails-af61b9cdae52947c816c7452d796304463ab0a89.tar.bz2
rails-af61b9cdae52947c816c7452d796304463ab0a89.zip
action
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4949 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/assert_select_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 0d48b99425..abeee689f4 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/fake_controllers'
unless defined?(ActionMailer)
begin
$:.unshift(File.dirname(__FILE__) + "/../../../actionmailer/lib")
- require 'active_mailer'
+ require 'action_mailer'
rescue LoadError
require 'rubygems'
require_gem 'actionmailer'
@@ -497,4 +497,4 @@ EOF
@controller.response_with = xml
get :xml
end
-end \ No newline at end of file
+end