diff --git a/README.md b/README.md index 5e841baae..0881cba8c 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ RAILS_ENV=test bin/rake db:setup Run the app locally: ``` bin/rails s + ``` Prerequisites for testing: install PhantomJS >= 2.0 diff --git a/app/views/mailer/reply.html.erb b/app/views/mailer/reply.html.erb index dadb17dfe..d2b6f6858 100644 --- a/app/views/mailer/reply.html.erb +++ b/app/views/mailer/reply.html.erb @@ -9,7 +9,7 @@
- <%= t("mailers.reply.new_reply_by_html", commenter: @reply.author.name) %> <%= link_to @commentable.title, commentable_url(@commentable), style: "color: #2895F1; text-decoration:none;" %> + <%= t("mailers.reply.new_reply_by_html", commenter: @reply.author.name) %> <%= link_to @commentable.title, comment_url(@reply.id), style: "color: #2895F1; text-decoration:none;" %>
diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 23efde526..fd3b219e6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -92,7 +92,8 @@ feature 'Emails' do email = open_last_email expect(email).to have_subject('Someone has responded to your comment') expect(email).to deliver_to(user) - expect(email).to have_body_text(debate_path(Comment.first.commentable)) + expect(email).to_not have_body_text(debate_path(Comment.first.commentable)) + expect(email).to have_body_text(comment_path(Comment.last)) expect(email).to have_body_text(I18n.t("mailers.config.manage_email_subscriptions")) expect(email).to have_body_text(account_path) end