From f58847213b3ef65016be6ebb657c53d0acaeef9f Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Thu, 2 Mar 2017 16:30:07 +0000
Subject: [PATCH] Fix new rubocop errors
---
app/finders/issuable_finder.rb | 2 +-
app/services/issues/export_csv_service.rb | 5 ++---
app/workers/export_csv_worker.rb | 2 +-
spec/services/issues/export_csv_service_spec.rb | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 80d59951ab1ec..78bbb0f6dcba8 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 1091d8b6abbe4..aba0d4ae48278 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 7dd712a7b2a96..40ad758063c14 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 b90112e35685b..9ba8023185e81 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
--
GitLab