From b96a3d4d60747102bc437c99b4d040c5c0329689 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 11 Aug 2017 15:28:46 +0100
Subject: [PATCH] Fix open discussions Put back deleted tests

---
 .../notes/components/issue_discussion.vue      |  2 +-
 .../components/issue_note_awards_list.vue      | 18 ++++++++++++++++--
 .../notes/components/issue_note_form.vue       |  1 -
 app/assets/javascripts/notes/stores/actions.js |  2 +-
 .../projects/issues/_discussion.html.haml      |  2 +-
 features/steps/shared/note.rb                  |  2 +-
 .../user_uses_slash_commands_spec.rb           |  6 +++---
 .../features/participants_autocomplete_spec.rb |  2 +-
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue
index 54bc607c431..58770111378 100644
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -1,5 +1,5 @@
 <script>
-  /* global Flash, Autosave */
+  /* global Flash */
   import { mapActions, mapGetters } from 'vuex';
   import { SYSTEM_NOTE } from '../constants';
   import issueNote from './issue_note.vue';
diff --git a/app/assets/javascripts/notes/components/issue_note_awards_list.vue b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
index b44be05c8eb..f6d27e0a0ae 100644
--- a/app/assets/javascripts/notes/components/issue_note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/issue_note_awards_list.vue
@@ -140,11 +140,25 @@
         return title;
       },
       handleAward(awardName) {
+        let parsedName;
+
+        // 100 and 1234 emoji are a number. Callback for v-for click sends it as a string
+        switch(awardName) {
+          case '100':
+            parsedName = 100;
+            break;
+          case '1234':
+            parsedName = 1234;
+            break;
+          default:
+            parsedName = awardName;
+            break;
+        }
+
         const data = {
           endpoint: this.toggleAwardPath,
           noteId: this.noteId,
-        // 100 emoji is a number. Callback for v-for click sends it as a string
-          awardName: awardName === '100' ? 100 : awardName,
+          awardName: parsedName,
         };
 
         this.toggleAwardRequest(data)
diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index fcfeb17edb5..fb6e16c5590 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -129,7 +129,6 @@
         :quick-actions-docs="quickActionsDocsUrl"
         :add-spacing-classes="false">
         <textarea
-          id="note-body"
           name="note[note]"
           class="note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
           :data-supports-quick-actions="!isEditing"
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index bb9c2c53b79..b52ec9700d8 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -86,7 +86,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
       const { errors } = res;
       const commandsChanges = res.commands_changes;
 
-      if (hasQuickActions && Object.keys(errors).length) {
+      if (hasQuickActions && errors && Object.keys(errors).length) {
         dispatch('fetchData');
 
         $('.js-gfm-input').trigger('clear-commands-cache.atwho');
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 8f4da97850f..538bb50d3c9 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -17,4 +17,4 @@
     = webpack_bundle_tag 'common_vue'
     = webpack_bundle_tag 'notes'
 
-= render "layouts/init_auto_complete"
\ No newline at end of file
+= render "layouts/init_auto_complete"
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 1c3432c3ca1..86c2600da6c 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -156,7 +156,7 @@ module SharedNote
     page.find('.current-note-edit-form textarea')
 
     page.within(".current-note-edit-form") do
-      fill_in '#note-body', with: '+1 Awesome!'
+      fill_in 'note[note]', with: '+1 Awesome!'
       click_button 'Save comment'
     end
     wait_for_requests
diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
index 9b5c21d752c..95c50df1896 100644
--- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb
+++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
@@ -67,7 +67,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
         it 'does not change the WIP prefix' do
           write_note("/wip")
 
-          expect(page).to have_content '/wip'
+          expect(page).not_to have_content '/wip'
           expect(page).not_to have_content 'Commands applied'
 
           expect(merge_request.reload.work_in_progress?).to eq false
@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
     describe 'merging the MR from the note' do
       context 'when the current user can merge the MR' do
         it 'merges the MR' do
-          write_note("/merge", false)
+          write_note("/merge")
 
           expect(page).to have_content 'Commands applied'
 
@@ -197,7 +197,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
         it 'does not change target branch' do
           write_note('/target_branch merge-test')
 
-          expect(page).to have_content '/target_branch merge-test'
+          expect(page).not_to have_content '/target_branch merge-test'
 
           expect(merge_request.target_branch).to eq 'feature'
         end
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index e71b7861efa..5ba2b6273be 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -15,7 +15,7 @@ feature 'Member autocomplete', :js do
     before do
       page.within('.new-note') do
         if note.noteable_type === 'Issue'
-          find('#note-body').send_keys('@')
+          find('.js-vue-comment-form').send_keys('@')
         else
           find('#note_note').send_keys('@')
         end