Text email version. Fixed test environment.

app/helpers/mailer_helper.rb

@@ -1,5 +1,17 @@
 module MailerHelper
 
+  def advertised_link name, url
+    (link url do
+    	orange_button do
+    		name
+    	end
+    end) +
+    (tag :br) +
+    (small_orange_link url do
+    	url
+    end)
+  end
+
   def body
     content_tag :div, :style => style_for(body_style) do
       yield

app/views/user_mailer/confirmation_instructions.html.erb

@@ -5,12 +5,4 @@
 	To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser
 <% end  %>
 <br/>
-<%= link confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) do %>
-	<%= orange_button do %>
-		Confirm my account
-	<% end %>
-<% end %>
-<br/>
-<%= small_orange_link confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) do %>
-	<%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
-<% end %>
+<%= advertised_link 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

app/views/user_mailer/reset_password_instructions.html.erb

@@ -5,15 +5,7 @@
 	Someone has requested a link to change your password, and you can do this through the link below.
 <% end  %>
 <br/>
-<%= link edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) do %>
-	<%= orange_button do %>
-		Change my password
-	<% end %>
-<% end %>
-<br/>
-<%= small_orange_link edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) do %>
-	<%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
-<% end %>
+<%= advertised_link 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
 <br/>
 <%= h2 do %>
 	If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.

config/environments/test.rb

@@ -25,6 +25,8 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  config.action_mailer.default_url_options = { :host => 'test' }
+
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types