summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-07-22 16:48:50 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-07-25 04:40:09 +0100
commit59ddf726a6866483c4ec9beaf27423206e3ed3e9 (patch)
tree2d5eef8ef480faa43c1e754115abebd448fbf541
parentdd79472bacd73fc3ece7129539e20d8bc78e22f1 (diff)
downloadgitlab-ce-59ddf726a6866483c4ec9beaf27423206e3ed3e9.tar.gz
Fixed failing tests with WaitForAjax
-rw-r--r--spec/features/merge_requests/diffs_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index ae237ad5e3f..dbc50ea5265 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
feature 'Diffs URL', js: true, feature: true do
+ include WaitForAjax
+
before do
login_as :admin
@merge_request = create(:merge_request)
@@ -153,6 +155,7 @@ feature 'Diffs URL', js: true, feature: true do
expect(notes_holder_input[:class].include? notes_holder_input_class).to be true
notes_holder_input.fill_in 'note[note]', with: test_note_comment
click_button 'Comment'
+ wait_for_ajax
expect(line_holder).to have_xpath notes_holder_input_xpath
notes_holder_saved = line_holder.find(:xpath, notes_holder_input_xpath)
expect(notes_holder_saved[:class].include? notes_holder_input_class).to be false