diff options
| -rw-r--r-- | app/assets/javascripts/users_select.js | 11 | ||||
| -rw-r--r-- | spec/features/boards/sidebar_spec.rb | 1 | ||||
| -rw-r--r-- | spec/features/issues/form_spec.rb | 10 | ||||
| -rw-r--r-- | spec/features/issues/issue_sidebar_spec.rb | 10 | ||||
| -rw-r--r-- | spec/features/issues_spec.rb | 4 |
5 files changed, 26 insertions, 10 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 8119a8cd000..24c95f9a14c 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -417,6 +417,17 @@ function UsersSelect(currentUser, els) { selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val(); return assignTo(selected); } + + // Automatically close dropdown after assignee is selected + // since CE has no multiple assignees + // EE does not have a max-select + if ($dropdown.data('max-select') && + getSelected().length === $dropdown.data('max-select')) { + // Close the dropdown + this.el.click(); + + this.hidden(); + } }, id: function (user) { return user.id; diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb index 1238647d3f3..4667be49fe6 100644 --- a/spec/features/boards/sidebar_spec.rb +++ b/spec/features/boards/sidebar_spec.rb @@ -115,7 +115,6 @@ describe 'Issue Boards', feature: true, js: true do click_link 'Unassigned' end - find('.dropdown-menu-toggle').click wait_for_vue_resource expect(page).to have_content('No assignee') diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb index 095cbb65c16..70f362a4743 100644 --- a/spec/features/issues/form_spec.rb +++ b/spec/features/issues/form_spec.rb @@ -24,8 +24,8 @@ describe 'New/edit issue', :feature, :js do visit new_namespace_project_issue_path(project.namespace, project) end - describe 'multiple assignees' do - before do + describe 'single assignee' do + it 'hides assignee after selection' do click_button 'Unassigned' wait_for_ajax @@ -54,11 +54,11 @@ describe 'New/edit issue', :feature, :js do expect(find('a', text: 'Assign to me', visible: false)).not_to be_visible - page.within '.dropdown-menu-user' do + page.within('.dropdown-menu-user') do click_link user.name end - expect(find('a', text: 'Assign to me')).to be_visible + expect(page.find('.dropdown-menu-user', visible: false)).not_to be_visible end end @@ -233,4 +233,4 @@ describe 'New/edit issue', :feature, :js do JS page.evaluate_script(js) end -end +end
\ No newline at end of file diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb index 0de0f93089a..dd8c46f1044 100644 --- a/spec/features/issues/issue_sidebar_spec.rb +++ b/spec/features/issues/issue_sidebar_spec.rb @@ -57,6 +57,16 @@ feature 'Issue Sidebar', feature: true do expect(page.find('.dropdown-menu-user-link.is-active')).to have_content(user.name) end end + + context 'single assignee' do + it 'hides assignee after selection' do + page.within('.dropdown-menu-user') do + click_link user.name + end + + expect(page.find('.block.assignee .selectbox', visible: false)).not_to be_visible + end + end end context 'as a allowed user' do diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index fdd78600a1d..da369a6f111 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -465,8 +465,6 @@ describe 'Issues', feature: true do click_link 'Edit' click_link @user.name - find('.dropdown-menu-toggle').click - page.within '.value .author' do expect(page).to have_content @user.name end @@ -474,8 +472,6 @@ describe 'Issues', feature: true do click_link 'Edit' click_link @user.name - find('.dropdown-menu-toggle').click - page.within '.value .assign-yourself' do expect(page).to have_content "No assignee" end |