fix media comments in conversations, closes #5826

Change-Id: If2232496b6b51db8729e37b2bfb0dc99c925c4e4
Reviewed-on: https://gerrit.instructure.com/5989
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>

Author: jenseng

app/controllers/conversations_controller.rb

@@ -661,7 +661,7 @@ def create_message_on_conversation(conversation=@conversation, update_for_sender
       media_id = params[:media_comment_id]
       media_type = params[:media_comment_type]
       if media_id.present? && media_type.present?
-        media_comment = MediaObject.by_media_id.by_media_type(media_id, media_type).first
+        media_comment = MediaObject.by_media_id(media_id).by_media_type(media_type).first
         if media_comment
           media_comment.context = @current_user
           media_comment.save

spec/selenium/conversations_spec.rb

@@ -3,13 +3,61 @@
 shared_examples_for "conversations selenium tests" do
   it_should_behave_like "in-process server selenium tests"
 
-  context "conversation loading" do
-    before do
-      course_with_teacher_logged_in
-      @user.watched_conversations_intro
-      @user.save
+  before do
+    course_with_teacher_logged_in
+    @user.watched_conversations_intro
+    @user.save
+  end
+
+  def new_conversation
+    get "/conversations"
+    keep_trying_until{ driver.find_element(:id, "create_message_form") }
+  end
+
+  def submit_message_form(opts={})
+    opts[:message] ||= "Test Message"
+    opts[:attachments] ||= []
+
+    if browser = find_with_jquery("#create_message_form .browser:visible")
+      browser.click
+      keep_trying_until{
+        if elem = find_with_jquery('.selectable:visible')
+          elem.click
+        end
+        elem
+      }
+    end
+
+    find_with_jquery("#create_message_form textarea").send_keys(opts[:message])
+
+    opts[:attachments].each_with_index do |fullpath, i|
+      driver.find_element(:id, "action_add_attachment").click
+      
+      keep_trying_until {
+        find_all_with_jquery("#create_message_form .file_input:visible")[i]
+      }.send_keys(fullpath)
     end
 
+    if opts[:media_comment]
+      driver.execute_script <<-JS
+        $("#media_comment_id").val(#{opts[:media_comment].first.inspect})
+        $("#media_comment_type").val(#{opts[:media_comment].last.inspect})
+        $("#create_message_form .media_comment").show()
+        $("#action_media_comment").hide()
+      JS
+    end
+
+    expect {
+      find_with_jquery("#create_message_form button[type='submit']").click
+      wait_for_ajax_requests
+    }.to change(ConversationMessage, :count).by(1)
+
+    message = ConversationMessage.last
+    driver.find_element(:id, "message_#{message.id}").should_not be_nil
+    message
+  end
+
+  context "conversation loading" do
     it "should load all conversations" do
       @me = @user
       num = 51
@@ -23,52 +71,29 @@
     end
   end
 
-  context "attachments" do
-    def new_conversation
-      get "/conversations"
-      keep_trying_until{ driver.find_element(:id, "create_message_form") }
-    end
+  context "media comments" do
+    it "should add a media comment to the message form" do
+      # don't have a good way to test kaltura here, so we just fake it up
+      Kaltura::ClientV3.should_receive(:config).at_least(:once).and_return({})
+      mo = MediaObject.new
+      mo.media_id = '0_12345678'
+      mo.media_type = 'audio'
+      mo.context = @user
+      mo.user = @user
+      mo.title = "test title"
+      mo.save!
 
-    def submit_message_form(opts={})
-      opts[:message] ||= "Test Message"
-      opts[:attachments] ||= []
-
-      if browser = find_with_jquery("#create_message_form .browser:visible")
-        browser.click
-        keep_trying_until{
-          if elem = find_with_jquery('.selectable:visible')
-            elem.click
-          end
-          elem
-        }
-      end
-
-      find_with_jquery("#create_message_form textarea").send_keys(opts[:message])
-
-      opts[:attachments].each_with_index do |fullpath, i|
-        driver.find_element(:id, "action_add_attachment").click
-        
-        keep_trying_until {
-          find_all_with_jquery("#create_message_form .file_input:visible")[i]
-        }.send_keys(fullpath)
-      end
-
-      expect {
-        find_with_jquery("#create_message_form button[type='submit']").click
-        wait_for_ajax_requests
-      }.to change(ConversationMessage, :count).by(1)
-
-      message = ConversationMessage.last
-      driver.find_element(:id, "message_#{message.id}").should_not be_nil
-      message
-    end
+      new_conversation
+
+      message = submit_message_form(:media_comment => [mo.media_id, mo.media_type])
+      message = "#message_#{message.id}"
 
-    before do
-      course_with_teacher_logged_in
-      @user.watched_conversations_intro
-      @user.save
+      find_all_with_jquery("#{message} .message_attachments li").size.should == 1
+      find_with_jquery("#{message} .message_attachments li a .title").text.should == mo.title
     end
+  end
 
+  context "attachments" do
     it "should be able to add an attachment to the message form" do
       new_conversation