aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/old_base/asset_host_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/test/old_base/asset_host_test.rb')
-rw-r--r--actionmailer/test/old_base/asset_host_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionmailer/test/old_base/asset_host_test.rb b/actionmailer/test/old_base/asset_host_test.rb
index aa9cfd88dd..36f0afcfd6 100644
--- a/actionmailer/test/old_base/asset_host_test.rb
+++ b/actionmailer/test/old_base/asset_host_test.rb
@@ -21,13 +21,17 @@ class AssetHostTest < Test::Unit::TestCase
end
def test_asset_host_as_string
- ActionController::Base.asset_host = "http://www.example.com"
+ ActionMailer::Base.configure do |c|
+ c.asset_host = "http://www.example.com"
+ c.assets_dir = File.dirname(__FILE__)
+ end
+
mail = AssetHostMailer.email_with_asset
assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.to_s.strip
end
def test_asset_host_as_one_arguement_proc
- ActionController::Base.asset_host = Proc.new { |source|
+ AssetHostMailer.config.asset_host = Proc.new { |source|
if source.starts_with?('/images')
"http://images.example.com"
else