diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
| commit | 24ab5665b2f12a589e96a4b742cc49c08bf0e9df (patch) | |
| tree | cbc703c96affe65fe8f0b24c6b6241286c820ba8 /actionmailer/test | |
| parent | 5e2bd08023344f3fd4675e80203a10967ffe9000 (diff) | |
| download | rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.gz rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.bz2 rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.zip | |
Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818.
This commit broke tests. You cannot have a file called "bundler" on the load path.
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 7 | ||||
| -rw-r--r-- | actionmailer/test/log_subscriber_test.rb | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 9d3c9086c9..f6baa4a9e8 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,7 +1,4 @@ -require File.expand_path('../../../bundler', __FILE__) - -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../load_paths', __FILE__) require 'test/unit' require 'action_mailer' @@ -17,7 +14,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/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb index 57b4a6a7f0..edd7c84d29 100644 --- a/actionmailer/test/log_subscriber_test.rb +++ b/actionmailer/test/log_subscriber_test.rb @@ -1,6 +1,3 @@ -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" |