diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-11 13:00:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-11 13:00:59 +0000 |
| commit | 1f08363650169925f01261863ee905ad103a177f (patch) | |
| tree | a5060fd083044d278328c0170f3467a20b32789b | |
| parent | 1cdc355a0fac752a9cd27552f3cf6823e8deaf87 (diff) | |
| parent | 136ba502d3ad3378f7746a18c3045346a2f49081 (diff) | |
| download | gitlab-ce-1f08363650169925f01261863ee905ad103a177f.tar.gz | |
Merge branch 'comment-error' into 'master'
Add error for ajax:error when submitting comments
Fixes #13814
cc @dblessing
See merge request !2976
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 7 | ||||
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 863a4edfad7..cb6b7b29935 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -30,6 +30,9 @@ class @Notes $(document).on "ajax:success", ".js-main-target-form", @addNote $(document).on "ajax:success", ".js-discussion-note-form", @addDiscussionNote + # catch note ajax errors + $(document).on "ajax:error", ".js-main-target-form", @addNoteError + # change note in UI after update $(document).on "ajax:success", "form.edit-note", @updateNote @@ -309,6 +312,10 @@ class @Notes addNote: (xhr, note, status) => @renderNote(note) + addNoteError: (xhr, note, status) => + flash = new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert') + flash.pinTo('.md-area') + ### Called in response to the new note form being submitted diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 51b15791674..243469b8e7d 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -361,7 +361,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps end step 'I can see the new rendered SVG image' do - expect(find('.file-content')).to have_css('img') + expect(page).to have_css('.file-content img') end private |