From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 18:55:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1816'
X-Git-Tag: live~3112
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c174845258f8bb55d5fa969563604b14dedea210?hp=b897832349ad0878e950ed177b7a050efb9a4a7c

Merge remote-tracking branch 'upstream/pull/1816'
---

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 46565869e..6b585b3f3 100644
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -23,7 +23,7 @@
   <ul class='secondary-actions clearfix'>
     <% if params[:action] == 'list' %>
       <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
-      <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li>
+      <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :message => { :title => "Re: #{diary_entry.title}" } %></li>
       <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
     <% end %>
 
diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index 0b54adb1c..03454767a 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -7,11 +7,11 @@
 <%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %>
   <fieldset>
     <div class='form-row'>
-      <label class="standard-label"><%= t'message.new.subject' %></label>
+      <label class="standard-label" for="message_title"><%= t'message.new.subject' %></label>
       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>
     <div class='form-row'>
-      <label class="standard-label"><%= t'message.new.body' %></label>
+      <label class="standard-label" for="message_body"><%= t'message.new.body' %></label>
       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>
diff --git a/config/routes.rb b/config/routes.rb
index 1016a89de..ca0c4ecf0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -224,7 +224,7 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/diary" => "diary_entry#list"
   get "/diary/:language" => "diary_entry#list"
   get "/diary" => "diary_entry#list"
-  get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/
+  get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry
   post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
   match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry
diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
new file mode 100644
index 000000000..39ccc04b2
--- /dev/null
+++ b/test/system/diary_entry_test.rb
@@ -0,0 +1,18 @@
+require "application_system_test_case"
+
+class DiaryEntrySystemTest < ApplicationSystemTestCase
+  def setup
+    create(:language, :code => "en")
+    @diary_entry = create(:diary_entry)
+  end
+
+  test "reply to diary entry should prefill the message subject" do
+    sign_in_as(create(:user))
+    visit diary_path
+
+    click_on "Reply to this entry"
+
+    assert page.has_content? "Send a new message"
+    assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 385a2f682..7198519a7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -150,5 +150,13 @@ module ActiveSupport
         end
       end
     end
+
+    def sign_in_as(user)
+      stub_hostip_requests
+      visit login_path
+      fill_in "username", :with => user.email
+      fill_in "password", :with => "test"
+      click_on "Login", :match => :first
+    end
   end
 end