summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-13 16:13:12 -0600
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-05 17:44:14 +0100
commit9c30b0e918ca035d8555de5e3393247f6d00ed16 (patch)
tree7aeea9695748036cf465952711184f2469427fab /features
parent336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 (diff)
downloadgitlab-ce-9c30b0e918ca035d8555de5e3393247f6d00ed16.tar.gz
Fix some specs
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 5510c65265a..a67b3222af3 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -347,6 +347,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see a discussion by user "John Doe" has started on diff' do
+ # Trigger a refresh of notes
+ execute_script("$(document).trigger('visibilitychange');")
+ wait_for_ajax
page.within(".notes .discussion") do
page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion"
page.should have_content sample_commit.line_code_path