diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 80d59951ab1ecf53746f6f617b0f00adedf9d4ea..78bbb0f6dcba8573c209dcbec44cf24621e617bd 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -20,7 +20,7 @@ # class IssuableFinder NONE = '0'.freeze - VALID_PARAMS = %i(scope state group_id project_id milestone_title assignee_id search label_name sort) + VALID_PARAMS = %i(scope state group_id project_id milestone_title assignee_id search label_name sort).freeze attr_accessor :current_user, :params diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb index 1091d8b6abbe47d464f88ef6b5eadd1fe8d6cfb2..aba0d4ae482784242e5c9d99b8b6c81c32118e6a 100644 --- a/app/services/issues/export_csv_service.rb +++ b/app/services/issues/export_csv_service.rb @@ -5,13 +5,12 @@ def initialize(issues_relation) @labels = @issues.labels_hash end - def render + def csv_data csv_builder.render end def email(user, project) - content = render - Notify.issues_csv_email(user, project, content, @issues.count).deliver_now + Notify.issues_csv_email(user, project, csv_data, @issues.count).deliver_now end private diff --git a/app/workers/export_csv_worker.rb b/app/workers/export_csv_worker.rb index 7dd712a7b2a9644129d44ec641e2acb113f07109..40ad758063c14f85acb2a0d4137d3a5e88b1ab11 100644 --- a/app/workers/export_csv_worker.rb +++ b/app/workers/export_csv_worker.rb @@ -6,7 +6,7 @@ def perform(current_user_id, project_id, params) @current_user = User.find(current_user_id) @project = Project.find(project_id) - params.merge!(project_id: project_id) + params[:project_id] = project_id issues = IssuesFinder.new(@current_user, params.symbolize_keys).execute diff --git a/spec/services/issues/export_csv_service_spec.rb b/spec/services/issues/export_csv_service_spec.rb index b90112e35685b2a24fdf0454c5d05c2c498a221a..9ba8023185e815f59e206845e01e0708a02ebe36 100644 --- a/spec/services/issues/export_csv_service_spec.rb +++ b/spec/services/issues/export_csv_service_spec.rb @@ -7,7 +7,7 @@ let(:subject) { described_class.new(Issue.all) } it 'renders csv to string' do - expect(subject.render).to be_a String + expect(subject.csv_data).to be_a String end describe '#email' do @@ -17,7 +17,7 @@ end def csv - CSV.parse(subject.render, headers: true) + CSV.parse(subject.csv_data, headers: true) end context 'includes' do