diff options
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 2 | ||||
| -rw-r--r-- | spec/features/issues/filter_issues_spec.rb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index d1fe116397a..90385621879 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -218,7 +218,7 @@ class @LabelsSelect selectable: true toggleLabel: (selected) -> - if selected and selected.title isnt 'Any Label' + if selected and selected.title? selected.title else defaultLabel diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb index 91de06e31f9..69b22232f10 100644 --- a/spec/features/issues/filter_issues_spec.rb +++ b/spec/features/issues/filter_issues_spec.rb @@ -84,16 +84,25 @@ describe 'Filter issues', feature: true do it 'should filter by any label' do find('.dropdown-menu-labels a', text: 'Any Label').click + page.within '.labels-filter' do + expect(page).to have_content 'Any Label' + end expect(find('.js-label-select .dropdown-toggle-text')).to have_content('Label') end it 'should filter by no label' do find('.dropdown-menu-labels a', text: 'No Label').click + page.within '.labels-filter' do + expect(page).to have_content 'No Label' + end expect(find('.js-label-select .dropdown-toggle-text')).to have_content('No Label') end it 'should filter by no label' do find('.dropdown-menu-labels a', text: label.title).click + page.within '.labels-filter' do + expect(page).to have_content label.title + end expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title) end end |