Improve tests and make preview for notes

app/assets/javascripts/notes.js.coffee

@@ -41,6 +41,9 @@ class Notes
     # add diff note
     $(document).on "click", ".js-add-diff-note-button", @addDiffNote
 
+    # hide diff note form
+    $(document).on "click", ".js-close-discussion-note-form", @cancelDiscussionForm
+
   cleanBinding: ->
     $(document).off "ajax:success", ".js-main-target-form"
     $(document).off "ajax:success", ".js-discussion-note-form"
@@ -350,6 +353,15 @@ class Notes
     form.removeClass "js-new-note-form"
     form.removeClass "js-new-note-form"
     GitLab.GfmAutoComplete.setup()
+
+    # setup preview buttons
+    previewButton = form.find(".js-note-preview-button")
+    form.find(".js-note-text").on "input", ->
+      if $(this).val().trim() isnt ""
+        previewButton.removeClass("turn-off").addClass "turn-on"
+      else
+        previewButton.removeClass("turn-on").addClass "turn-off"
+
     form.show()
 
   ###
@@ -394,4 +406,11 @@ class Notes
       # only remove the form
       form.remove()
 
+
+  cancelDiscussionForm: (e) =>
+    e.preventDefault()
+    form = $(".js-new-note-form")
+    form = $(e.target).closest(".js-discussion-note-form")
+    @removeDiscussionNoteForm(form)
+
 @Notes = Notes

features/steps/project/project_merge_requests.rb

@@ -115,19 +115,26 @@ class ProjectMergeRequests < Spinach::FeatureSteps
   And 'I leave a comment on the diff page' do
     init_diff_note
 
-    within('.js-temp-notes-holder') do
+    within('.js-discussion-note-form') do
       fill_in "note_note", with: "One comment to rule them all"
       click_button "Add Comment"
     end
+
+    within ".note-text" do
+      page.should have_content "One comment to rule them all"
+    end
   end
 
   And 'I leave a comment like "Line is wrong" on line 185 of the first file' do
     init_diff_note
 
-    within(".js-temp-notes-holder") do
+    within(".js-discussion-note-form") do
       fill_in "note_note", with: "Line is wrong"
       click_button "Add Comment"
-      sleep 0.05
+    end
+
+    within ".note-text" do
+      page.should have_content "Line is wrong"
     end
   end