Fix ActionMailer tests that depend on run order

rails · Aug 23, 2012 · 73f0afd · 73f0afd
1 parent 961957d
commit 73f0afd
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
@@ -493,14 +493,18 @@ def stub_queue(klass, queue)
   end
 
   test "assets tags should use a Mailer's asset_host settings when available" do
-    ActionMailer::Base.config.asset_host = "global.com"
+    begin
-    ActionMailer::Base.config.assets_dir = "global/"
+      ActionMailer::Base.config.asset_host = "http://global.com"
+      ActionMailer::Base.config.assets_dir = "global/"
 
-    AssetMailer.asset_host = "http://local.com"
+      AssetMailer.asset_host = "http://local.com"
 
-    mail = AssetMailer.welcome
+      mail = AssetMailer.welcome
 
-    assert_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
+      assert_equal(%{<img alt="Dummy" src="http://local.com/images/dummy.png" />}, mail.body.to_s.strip)
+    ensure
+      AssetMailer.asset_host = ActionMailer::Base.config.asset_host
+    end
   end
 
   # Before and After hooks