summaryrefslogtreecommitdiff
path: root/features/steps/project/forked_merge_requests.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-06 16:10:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-06 16:10:38 +0000
commitc5eb2977d7750a6f3255941f72a1002259468834 (patch)
tree0363458fc082e664f3bb7c5f7b6ed74290c772cc /features/steps/project/forked_merge_requests.rb
parent2c46cf084bcb0f06121f2fc4374379cc6f45ea0d (diff)
parent70f5291808469a808eb2bee70e9e97acc7716bb6 (diff)
downloadgitlab-ce-c5eb2977d7750a6f3255941f72a1002259468834.tar.gz
Merge branch 'add-current-user-to-autocomplete' into 'master'
Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100
Diffstat (limited to 'features/steps/project/forked_merge_requests.rb')
-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