diff options
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/_labels_row.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 | ||||
| -rw-r--r-- | features/project/issues/filter_labels.feature | 1 | ||||
| -rw-r--r-- | features/steps/project/issues/filter_labels.rb | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index f81a04a3c86..9ce5562e667 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -1,3 +1,5 @@ -- labels.each do |l| - %span.label-row - = link_to_label(l, tooltip: false)
\ No newline at end of file +%span.label-row + %span.label-name + = link_to_label(label, tooltip: false) + %span.prepend-left-10 + = markdown(label.description, pipeline: :single_line)
\ No newline at end of file diff --git a/app/views/shared/_labels_row.html.haml b/app/views/shared/_labels_row.html.haml new file mode 100644 index 00000000000..f81a04a3c86 --- /dev/null +++ b/app/views/shared/_labels_row.html.haml @@ -0,0 +1,3 @@ +- labels.each do |l| + %span.label-row + = link_to_label(l, tooltip: false)
\ No newline at end of file diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 623ca5ab98f..c14391ada0f 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -48,7 +48,7 @@ .gray-content-block.second-block.filtered-labels - if @labels - = render "shared/label_row", labels: @labels + = render "shared/labels_row", labels: @labels :javascript new UsersSelect(); diff --git a/features/project/issues/filter_labels.feature b/features/project/issues/filter_labels.feature index e07f8053fb7..49d7a3b9af2 100644 --- a/features/project/issues/filter_labels.feature +++ b/features/project/issues/filter_labels.feature @@ -12,6 +12,7 @@ Feature: Project Issues Filter Labels @javascript Scenario: I filter by one label Given I click link "bug" + And I click "dropdown close button" Then I should see "Bugfix1" in issues list And I should see "Bugfix2" in issues list And I should not see "Feature1" in issues list diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb index 6d50501a722..d82c6856918 100644 --- a/features/steps/project/issues/filter_labels.rb +++ b/features/steps/project/issues/filter_labels.rb @@ -32,6 +32,10 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps page.find('.js-label-select').click sleep 0.5 execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()") + end + + step 'I click "dropdown close button"' do + page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click sleep 2 end |