Permalink
Browse files

Merge branch 'staging'

  • Loading branch information...
2 parents fbd9bea + efb9626 commit e1a50c126359138f66e975bb97e4b9cacdfe7bef @gravitystorm gravitystorm committed May 16, 2012
Showing with 4 additions and 0 deletions.
  1. +3 −0 config/locales/en-GB.yml
  2. +1 −0 spec/requests/issues_with_notifications_spec.rb
View
@@ -361,10 +361,13 @@
subject: "You are now a member of %{group_name}"
new_group_thread:
subject: "[Cyclescape] \"%{thread_title}\" (%{group_name})"
+ new_group_location_issue:
+ subject: "[Cyclescape] New issue reported in %{group_name}'s area"
new_user_location_issue:
subject: "[Cyclescape] New issue reported near your %{category} location"
new_user_location_issue_thread:
subject: "[Cyclescape] New thread started on issue \"%{issue_title}\""
+
thread_mailer:
common:
subject:
@@ -76,6 +76,7 @@ def fill_in_issue
fill_in_issue
click_on "Send Report"
email = open_last_email_for(notifiee.email)
+ email.should have_subject("[Cyclescape] New issue reported in #{group_profile.group.name}'s area")
email.should have_body_text("in the #{group_profile.group.name}'s area")
email.should have_body_text(issue_values[:description])
email.should have_body_text(issue_values[:title])

0 comments on commit e1a50c1

Please sign in to comment.