summaryrefslogtreecommitdiff
path: root/features/steps/project
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-07 15:05:17 +0200
committerDouwe Maan <douwe@gitlab.com>2015-08-07 15:05:17 +0200
commitad55f0d6f9ec29026b36ee32ff5fc6081e3793de (patch)
treecd2b9919de1d5597922ac0ac1c2c3dc9a54a0ab0 /features/steps/project
parent8b6ae0104df7e053ff3ad06e089c96273854c4e3 (diff)
parent4b7c2f0b503eb7400cee4cd5011733d689393691 (diff)
downloadgitlab-ce-comment-updated-by.tar.gz
Merge branch 'master' into comment-updated-bycomment-updated-by
Diffstat (limited to 'features/steps/project')
-rw-r--r--features/steps/project/forked_merge_requests.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 3e6beb20e78..2a333222fb2 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -137,10 +137,11 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step 'I should see the users from the target project ID' do
- expect(page).to have_selector('.user-result', visible: true, count: 2)
+ expect(page).to have_selector('.user-result', visible: true, count: 3)
users = page.all('.user-name')
expect(users[0].text).to eq 'Unassigned'
- expect(users[1].text).to eq @project.users.first.name
+ expect(users[1].text).to eq current_user.name
+ expect(users[2].text).to eq @project.users.first.name
end
# Verify a link is generated against the correct project