diff options
| -rw-r--r-- | app/views/shared/issuable/_label_page_default.html.haml | 2 | ||||
| -rw-r--r-- | spec/services/issues/bulk_update_service_spec.rb | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml index 935a0193a2d..4e280c371ac 100644 --- a/app/views/shared/issuable/_label_page_default.html.haml +++ b/app/views/shared/issuable/_label_page_default.html.haml @@ -6,7 +6,7 @@ = dropdown_title(title) = dropdown_filter(filter_placeholder) = dropdown_content - - if @project and show_footer + - if @project && show_footer = dropdown_footer do %ul.dropdown-footer-list - if can?(current_user, :admin_label, @project) diff --git a/spec/services/issues/bulk_update_service_spec.rb b/spec/services/issues/bulk_update_service_spec.rb index ad19fe0f151..4a689e64dc5 100644 --- a/spec/services/issues/bulk_update_service_spec.rb +++ b/spec/services/issues/bulk_update_service_spec.rb @@ -6,9 +6,10 @@ describe Issues::BulkUpdateService, services: true do let!(:result) { Issues::BulkUpdateService.new(project, user, params).execute } - before do - @issues = create_list(:issue, 5, project: @project) - @params = { + describe :close_issue do + let(:issues) { create_list(:issue, 5, project: project) } + let(:params) do + { state_event: 'close', issues_ids: issues.map(&:id).join(',') } @@ -26,9 +27,9 @@ describe Issues::BulkUpdateService, services: true do end describe :reopen_issues do - before do - @issues = create_list(:closed_issue, 5, project: @project) - @params = { + let(:issues) { create_list(:closed_issue, 5, project: project) } + let(:params) do + { state_event: 'reopen', issues_ids: issues.map(&:id).join(',') } |