aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/log_subscriber_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
commit3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch)
tree8528d926c137a3a0f18c21642a8b6be1f334b6df /actionmailer/test/log_subscriber_test.rb
parentd4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff)
parent762088a0ef1f69ab09833732cfe8190098303ee6 (diff)
downloadrails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip
Merge master.
Diffstat (limited to 'actionmailer/test/log_subscriber_test.rb')
-rw-r--r--actionmailer/test/log_subscriber_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
index edd7c84d29..57b4a6a7f0 100644
--- a/actionmailer/test/log_subscriber_test.rb
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -1,3 +1,6 @@
+railties_path = File.expand_path('../../../railties/lib', __FILE__)
+$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
+
require "abstract_unit"
require "rails/log_subscriber/test_helper"
require "action_mailer/railties/log_subscriber"