summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-16 20:40:52 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-16 20:40:52 +0300
commit9e30b75e9c5ab91de955b6212df825f5e85c0e57 (patch)
tree8391782bf0ccc3501b1e5f821f17b8a5c1e9373b /features
parentb1b197ae5e42c7f9a645f249bff28235bdba4c80 (diff)
downloadgitlab-ce-9e30b75e9c5ab91de955b6212df825f5e85c0e57.tar.gz
Fix merge requests feature testsfix-merge-request-diff-spinach-failures
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/shared/note.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 3d7c6ef9d2d..d3b5b0bdebe 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -1,5 +1,8 @@
+require Rails.root.join('features/support/wait_for_ajax')
+
module SharedNote
include Spinach::DSL
+ include WaitForAjax
step 'I delete a comment' do
page.within('.main-notes-list') do
@@ -116,8 +119,9 @@ module SharedNote
page.within(".js-main-target-form") do
fill_in "note[note]", with: "# Comment with a header"
click_button "Comment"
- sleep 0.05
end
+
+ wait_for_ajax
end
step 'The comment with the header should not have an ID' do