diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-02-15 10:20:11 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-02-15 10:20:11 -0600 |
| commit | eec2d301d4ce9df9c71c1a5aa63053eb970b6818 (patch) | |
| tree | 760bf54f7802d3e4f76e2db5bc642bb52637b532 /actionmailer | |
| parent | 7cff54f5d3ae2e364f0d147ceb86ea701b21389c (diff) | |
| download | rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.gz rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.bz2 rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.zip | |
Fix test load paths for those not using bundler
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 7 | ||||
| -rw-r--r-- | actionmailer/test/subscriber_test.rb | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index f6baa4a9e8..9d3c9086c9 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,4 +1,7 @@ -require File.expand_path('../../../load_paths', __FILE__) +require File.expand_path('../../../bundler', __FILE__) + +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'test/unit' require 'action_mailer' @@ -14,7 +17,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b FIXTURE_LOAD_PATH = File.expand_path('fixtures', File.dirname(__FILE__)) ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH -class MockSMTP +class MockSMTP def self.deliveries @@deliveries end diff --git a/actionmailer/test/subscriber_test.rb b/actionmailer/test/subscriber_test.rb index 3d1736d64f..88a5d2ca34 100644 --- a/actionmailer/test/subscriber_test.rb +++ b/actionmailer/test/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/subscriber/test_helper" require "action_mailer/railties/subscriber" |