summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-06 00:20:41 -0700
committerStan Hu <stanhu@gmail.com>2015-08-06 00:46:14 -0700
commit70f5291808469a808eb2bee70e9e97acc7716bb6 (patch)
treebe9ed5a58663054c584388076ef9a77e65f9b47e /features
parentcaf4c0dd87ff8c803ed3ed49cda85b29d144668f (diff)
downloadgitlab-ce-70f5291808469a808eb2bee70e9e97acc7716bb6.tar.gz
Always add current user to autocomplete controller to support filter by "Me"
Partial fix #2202
Diffstat (limited to 'features')
-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 58c16d59d05..3e97e84d116 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -138,10 +138,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