diff options
| -rw-r--r-- | app/views/sent_notifications/unsubscribe.html.haml | 14 | ||||
| -rw-r--r-- | spec/features/unsubscribe_links_spec.rb | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/app/views/sent_notifications/unsubscribe.html.haml b/app/views/sent_notifications/unsubscribe.html.haml index 9baadf8a0c5..9ce6a1aeef5 100644 --- a/app/views/sent_notifications/unsubscribe.html.haml +++ b/app/views/sent_notifications/unsubscribe.html.haml @@ -1,13 +1,17 @@ - noteable = @sent_notification.noteable - noteable_type = @sent_notification.noteable_type.humanize(capitalize: false) -- noteable_text = %(#{noteable_type} "#{noteable.title}" (#{noteable.to_reference})) -- title = "Unsubscribe from #{noteable_text}" +- noteable_text = %(#{noteable.title} (#{noteable.to_reference})) -- page_title title +- page_title "Unsubscribe", noteable_text, @sent_notification.noteable_type.humanize.pluralize, @sent_notification.project.name_with_namespace -%h3.page-title= title -%p= "Are you sure you want to unsubscribe from #{noteable_text}?" +%h3.page-title + Unsubscribe from #{noteable_type} #{noteable_text} + +%p + = succeed '?' do + Are you sure you want to unsubscribe from #{noteable_type} + = link_to noteable_text, url_for([@sent_notification.project.namespace.becomes(Namespace), @sent_notification.project, noteable]) %p = link_to 'Unsubscribe', unsubscribe_sent_notification_path(@sent_notification, force: true), diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb index 3802f5f1335..cc40671787c 100644 --- a/spec/features/unsubscribe_links_spec.rb +++ b/spec/features/unsubscribe_links_spec.rb @@ -24,8 +24,8 @@ describe 'Unsubscribe links', feature: true do visit body_link expect(current_path).to eq unsubscribe_sent_notification_path(SentNotification.last) - expect(page).to have_text(%(Unsubscribe from issue "#{issue.title}" (#{issue.to_reference}))) - expect(page).to have_text(%(Are you sure you want to unsubscribe from issue "#{issue.title}" (#{issue.to_reference})?)) + expect(page).to have_text(%(Unsubscribe from issue #{issue.title} (#{issue.to_reference}))) + expect(page).to have_text(%(Are you sure you want to unsubscribe from issue #{issue.title} (#{issue.to_reference})?)) expect(issue.subscribed?(recipient)).to be_truthy click_link 'Unsubscribe' |