Merge pull request #461 from alphagov/explain-why-youre-getting-emails

pixeltrix · pixeltrix · commit 61743562bd2f · 2016-05-05T06:43:59.000+01:00
Update unsubscribe link to explain up-front why you're receiving emails
diff --git a/app/views/petition_mailer/email_creator.html.erb b/app/views/petition_mailer/email_creator.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>You recently created the petition "<%= @petition.action %>":<br />
@@ -9,4 +13,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you created this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/email_creator.text.erb b/app/views/petition_mailer/email_creator.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 You recently created the petition "<%= @petition.action %>":
@@ -9,4 +13,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you created this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/email_signer.html.erb b/app/views/petition_mailer/email_signer.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>You recently signed the petition "<%= @petition.action %>":<br />
@@ -9,4 +13,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you signed this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/email_signer.text.erb b/app/views/petition_mailer/email_signer.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 You recently signed the petition "<%= @petition.action %>":
@@ -9,4 +13,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you signed this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_outcome.html.erb b/app/views/petition_mailer/notify_creator_of_debate_outcome.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <% if @debate_outcome.debated? %>
@@ -32,4 +36,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you created this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_outcome.text.erb b/app/views/petition_mailer/notify_creator_of_debate_outcome.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 <% if @debate_outcome.debated? %>
@@ -33,4 +37,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you created this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_scheduled.html.erb b/app/views/petition_mailer/notify_creator_of_debate_scheduled.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>Parliament is going to debate your petition – “<%= @petition.action %>”.</p>
@@ -12,4 +16,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you created this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_scheduled.text.erb b/app/views/petition_mailer/notify_creator_of_debate_scheduled.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 Parliament is going to debate your petition – "<%= @petition.action %>".
@@ -12,4 +16,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you created this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_threshold_response.html.erb b/app/views/petition_mailer/notify_creator_of_threshold_response.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>The Government has responded to your petition – “<%= link_to @petition.action, petition_url(@petition) %>”.</p>
@@ -24,4 +28,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you created this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you created this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_threshold_response.text.erb b/app/views/petition_mailer/notify_creator_of_threshold_response.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 The Government has responded to your petition – "<%= @petition.action %>".
@@ -24,4 +28,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you created this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you created this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_outcome.html.erb b/app/views/petition_mailer/notify_signer_of_debate_outcome.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <% if @debate_outcome.debated? %>
@@ -32,4 +36,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you signed this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_outcome.text.erb b/app/views/petition_mailer/notify_signer_of_debate_outcome.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 <% if @debate_outcome.debated? %>
@@ -33,4 +37,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you signed this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_scheduled.html.erb b/app/views/petition_mailer/notify_signer_of_debate_scheduled.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>Parliament is going to debate the petition you signed – “<%= @petition.action %>”.</p>
@@ -12,4 +16,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you signed this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_scheduled.text.erb b/app/views/petition_mailer/notify_signer_of_debate_scheduled.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 Parliament is going to debate the petition you signed – "<%= @petition.action %>".
@@ -12,4 +16,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you signed this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_signer_of_threshold_response.html.erb b/app/views/petition_mailer/notify_signer_of_threshold_response.html.erb
@@ -1,3 +1,7 @@
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+
 <p>Dear <%= @signature.name %>,</p>
 
 <p>The Government has responded to the petition you signed – “<%= link_to @petition.action, petition_url(@petition) %>”.</p>
@@ -24,4 +28,6 @@
 <%= t("petitions.emails.signoff_prefix") %><br />
 <%= t("petitions.emails.signoff_suffix") %></p>
 
-<p><small>You’re receiving this email because you signed this petition. <%= link_to 'Unsubscribe', unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<hr>
+<p><small>You’re receiving this email because you signed this petition.</small></p>
+<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_threshold_response.text.erb b/app/views/petition_mailer/notify_signer_of_threshold_response.text.erb
@@ -1,3 +1,7 @@
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+
 Dear <%= @signature.name %>,
 
 The Government has responded to the petition you signed – "<%= @petition.action %>".
@@ -24,4 +28,6 @@ Thanks,
 <%= t("petitions.emails.signoff_prefix") %>
 <%= t("petitions.emails.signoff_suffix") %>
 
-You’re receiving this email because you signed this petition. Unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+--
+You’re receiving this email because you signed this petition.
+To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/features/step_definitions/debate_scheduled_steps.rb b/features/step_definitions/debate_scheduled_steps.rb
@@ -4,7 +4,7 @@
     Then "#{@petition.creator_signature.email}" should receive an email
     When they open the email
     Then they should see "Parliament is going to debate your petition" in the email body
-    When they click the first link in the email
+    When they click the second link in the email
     Then I should be on the petition page for "#{@petition.action}"
   )
 end
@@ -16,7 +16,7 @@
       Then "#{signatory.email}" should receive an email
       When they open the email
       Then they should see "Parliament is going to debate the petition" in the email body
-      When they click the first link in the email
+      When they click the second link in the email
       Then I should be on the petition page for "#{@petition.action}"
     )
   end
diff --git a/features/step_definitions/email_steps.rb b/features/step_definitions/email_steps.rb
@@ -33,7 +33,12 @@ def current_email_address
   end
 
   def text_and_links_in_email(email)
-    email.default_part_body.to_s.scan(%r{<a[^>]+href="([^"]+)"[^>]*>([^<]+)</a>})
+    html = Nokogiri::HTML(email.default_part_body.to_s)
+    html.xpath("//a").map{ |node| [node["href"], node.text] }
+  end
+
+  def links_in_email(email)
+    text_and_links_in_email(email).map(&:first)
   end
 end
 
@@ -180,6 +185,10 @@ def text_and_links_in_email(email)
   visit links_in_email(current_email).first
 end
 
+When /^(?:I|they) click the second link in the email$/ do
+  visit links_in_email(current_email).second
+end
+
 #
 # Debugging
 # These only work with Rails and OSx ATM since EmailViewer uses RAILS_ROOT and OSx's 'open' command.
