diff options
author | Robert Speicher <robert@gitlab.com> | 2015-12-30 23:23:24 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-12-30 23:23:24 +0000 |
commit | 7945cf4163e069c5535968812d259541ec2fd4e8 (patch) | |
tree | ce747cd84f731e1160713373c7bace045fcecb9a | |
parent | 586ac6460b54dcb280d52948013ae55dac7aad88 (diff) | |
parent | 00dc5f1b3ea738c602246bda11fc607042b3e76d (diff) | |
download | gitlab-ce-7945cf4163e069c5535968812d259541ec2fd4e8.tar.gz |
Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' into 'master'
Swap Author and Assignee Selectors on issuable index view
Closes #4039
See merge request !2256
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 8 | ||||
-rw-r--r-- | features/steps/project/issues/issues.rb | 9 |
3 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG index 712563e5f06..353d5060eba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.4.0 (unreleased) - Add CAS support (tduehr) - Add link to merge request on build detail page - Revert back upvote and downvote button to the issue and MR pages + - Swap position of Assignee and Author selector on Issueables (Zeger-Jan van de Weg) v 8.3.3 (unreleased) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index ac6c248ccf1..be06738eac9 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -30,13 +30,13 @@ class: "check_all_issues left" .issues-other-filters .filter-item.inline - = users_select_tag(:assignee_id, selected: params[:assignee_id], - placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) - - .filter-item.inline = users_select_tag(:author_id, selected: params[:author_id], placeholder: 'Author', class: 'trigger-submit', any_user: "Any Author", first_user: true, current_user: true) + .filter-item.inline + = users_select_tag(:assignee_id, selected: params[:assignee_id], + placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) + .filter-item.inline.milestone-filter = select_tag('milestone_title', projects_milestones_options, class: 'select2 trigger-submit', include_blank: true, diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 4a7ff21d385..8e8c9c57452 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -59,15 +59,14 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end step 'I click "author" dropdown' do - first('.ajax-users-select').click + first('#s2id_author_id').click end step 'I see current user as the first user' do - expect(page).to have_selector('.user-result', visible: true, count: 4) + expect(page).to have_selector('.user-result', visible: true, count: 3) users = page.all('.user-name') - expect(users[0].text).to eq 'Any Assignee' - expect(users[1].text).to eq 'Unassigned' - expect(users[2].text).to eq current_user.name + expect(users[0].text).to eq 'Any Author' + expect(users[1].text).to eq current_user.name end step 'I submit new issue "500 error on profile"' do |