diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:43:45 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:43:45 +0100 |
commit | 75486f09c4b8f2df17e2c16bf4d97fceb34dc9ad (patch) | |
tree | 9c44f07bf4991a208b969b8bddf0b04e1edb02be /spec/features | |
parent | e7969d6f6c743ead94b3b430b9184ad21f647337 (diff) | |
parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
download | gitlab-ce-75486f09c4b8f2df17e2c16bf4d97fceb34dc9ad.tar.gz |
Merge branch 'master' into zj/gitlab-ce-merge-if-green
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index d7cb3b2e86e..f0fc6916c4d 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' describe 'Comments', feature: true do include RepoHelpers + include WaitForAjax describe 'On a merge request', js: true, feature: true do let!(:merge_request) { create(:merge_request) } @@ -123,8 +124,8 @@ describe 'Comments', feature: true do it 'removes the attachment div and resets the edit form' do find('.js-note-attachment-delete').click is_expected.not_to have_css('.note-attachment') - expect(find('.current-note-edit-form', visible: false)). - not_to be_visible + is_expected.not_to have_css('.current-note-edit-form') + wait_for_ajax end end end |