minor fixes to message display - fixes #7806

Author: azul

app/controllers/me/posts_controller.rb

@@ -18,6 +18,7 @@ def index
     @other_user = @recipient
     @discussion.mark!(:read, current_user)
     @posts = @discussion.posts.paginate(post_pagination_params)
+    @post = Post.new
   end
 
   def create

app/models/notice/private_message_notice.rb

@@ -31,7 +31,8 @@ def display_body_as_quote?
 
   def display_body
     # this is now post.body_html
-    data[:message]
+    # it's html safe because it's the Greencloth output.
+    data[:message].html_safe
   end
 
   def button_text

app/views/me/discussions/_message_form.html.haml

@@ -3,7 +3,7 @@
 
 - text = ""
 - recipient_name = ""
-- text_area = text_area_tag('post[body]', text, id: 'say_msg', rows: '8')
+- text_area = text_area_tag('post[body]', text, id: 'post_body', rows: '8')
 - send_button = button_to_function(:send_button.t, send_message_function(recipient_name))
 
 = form_tag('', id: 'say_form') do

app/views/me/notices/_notice.html.haml

@@ -6,13 +6,13 @@
       %br
       %span{style: 'font-size:85%'}= friendly_date notice.created_at
   %td.icon.small{style: avatar_style(notice, 'small')}
-    =h embold_links notice.display_title
-    %br
-    - # TODO truncate messes up HTML, and we maybe should have a scroll bar instead of using truncate anyway.
-    - if notice.display_body_as_quote?
-      %i=h truncate(embold_links(notice.display_body), length: 512)
-    - else
-      =h truncate(embold_links(notice.display_body), length: 512)
+    %div{style: "max-height: 80px; overflow-y: auto;"}
+      =h embold_links notice.display_title
+      %br
+      - if notice.display_body_as_quote?
+        %i= embold_links(notice.display_body)
+      - else
+        = embold_links(notice.display_body)
   %td.nowrap.align_right.reflow
     = spinner(notice, align: :middle)
     - url = self.send(notice.noticable_path, notice.noticable)

test/integration/message_test.rb

@@ -0,0 +1,18 @@
+require 'javascript_integration_test'
+
+class MessageTest < JavascriptIntegrationTest
+
+
+  def test_sending_message
+    msg = "Here is my Message"
+    login users(:blue)
+    click_on 'Messages'
+    click_on 'Send Message'
+    fill_in 'Recipient', with: 'red'
+    fill_in 'Message', with: msg
+    click_on 'Send'
+    assert_content msg
+  end
+
+end
+