aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-05 13:32:22 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-05 13:32:22 +0000
commit1ad87adc9f17ef004b0005725a456b1d3f141734 (patch)
treefce65594dc194a92eb8d07acc99b031d1e3bd898
parent9d755f19837da703d494ff4c59c39a0066bbd961 (diff)
downloadrails-1ad87adc9f17ef004b0005725a456b1d3f141734.tar.gz
rails-1ad87adc9f17ef004b0005725a456b1d3f141734.tar.bz2
rails-1ad87adc9f17ef004b0005725a456b1d3f141734.zip
require abstract_unit directly since test is in load path
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8565 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionmailer/test/delivery_method_test.rb2
-rw-r--r--actionmailer/test/mail_helper_test.rb2
-rw-r--r--actionmailer/test/mail_render_test.rb2
-rwxr-xr-xactionmailer/test/mail_service_test.rb2
-rw-r--r--actionmailer/test/quoting_test.rb2
-rw-r--r--actionmailer/test/test_helper_test.rb2
-rw-r--r--actionmailer/test/tmail_test.rb2
-rw-r--r--actionmailer/test/url_test.rb4
8 files changed, 9 insertions, 9 deletions
diff --git a/actionmailer/test/delivery_method_test.rb b/actionmailer/test/delivery_method_test.rb
index ebee23560a..0731512ea4 100644
--- a/actionmailer/test/delivery_method_test.rb
+++ b/actionmailer/test/delivery_method_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class DefaultDeliveryMethodMailer < ActionMailer::Base
end
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 70e5cb81d5..e94aeff074 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
module MailerHelper
def person_name
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb
index 475735e7b0..fbcd1887e4 100644
--- a/actionmailer/test/mail_render_test.rb
+++ b/actionmailer/test/mail_render_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class RenderMailer < ActionMailer::Base
def inline_template(recipient)
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index eb408f96cf..b90035f5f9 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class FunkyPathMailer < ActionMailer::Base
self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb
index 14981571df..35a88705fd 100644
--- a/actionmailer/test/quoting_test.rb
+++ b/actionmailer/test/quoting_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
require 'tmail'
require 'tempfile'
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index d361e23a8e..ab14bcc561 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require 'abstract_unit'
class TestHelperMailer < ActionMailer::Base
def test
diff --git a/actionmailer/test/tmail_test.rb b/actionmailer/test/tmail_test.rb
index b40d8945c5..718990e79e 100644
--- a/actionmailer/test/tmail_test.rb
+++ b/actionmailer/test/tmail_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class TMailMailTest < Test::Unit::TestCase
def test_body
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 5647869622..71286bd1cf 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
class TestMailer < ActionMailer::Base
@@ -73,4 +73,4 @@ class ActionMailerUrlTest < Test::Unit::TestCase
assert_not_nil ActionMailer::Base.deliveries.first
assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
end
-end \ No newline at end of file
+end