Skip to content

Commit 7e02085

Browse files
committed
Rename csv methods
1 parent 5122bbc commit 7e02085

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

app/controllers/reports_controller.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def questions_with_add_another_answer
2424
questions = Reports::FeatureReportService.new(forms).questions_with_add_another_answer
2525

2626
if params[:format] == "csv"
27-
send_data Reports::QuestionsCsvReportService.new(questions).questions_csv,
27+
send_data Reports::QuestionsCsvReportService.new(questions).csv,
2828
type: "text/csv; charset=iso-8859-1",
2929
disposition: "attachment; filename=#{csv_filename('live_questions_with_add_another_answer_report')}"
3030
else
@@ -37,7 +37,7 @@ def forms_with_routes
3737
forms = Reports::FeatureReportService.new(forms).forms_with_routes
3838

3939
if params[:format] == "csv"
40-
send_data Reports::FormsCsvReportService.new(forms).forms_csv,
40+
send_data Reports::FormsCsvReportService.new(forms).csv,
4141
type: "text/csv; charset=iso-8859-1",
4242
disposition: "attachment; filename=#{csv_filename('live_forms_with_routes_report')}"
4343
else
@@ -50,7 +50,7 @@ def forms_with_payments
5050
forms = Reports::FeatureReportService.new(forms).forms_with_payments
5151

5252
if params[:format] == "csv"
53-
send_data Reports::FormsCsvReportService.new(forms).forms_csv,
53+
send_data Reports::FormsCsvReportService.new(forms).csv,
5454
type: "text/csv; charset=iso-8859-1",
5555
disposition: "attachment; filename=#{csv_filename('live_forms_with_payments_report')}"
5656
else
@@ -63,7 +63,7 @@ def forms_with_csv_submission_enabled
6363
forms = Reports::FeatureReportService.new(forms).forms_with_csv_submission_enabled
6464

6565
if params[:format] == "csv"
66-
send_data Reports::FormsCsvReportService.new(forms).forms_csv,
66+
send_data Reports::FormsCsvReportService.new(forms).csv,
6767
type: "text/csv; charset=iso-8859-1",
6868
disposition: "attachment; filename=#{csv_filename('live_forms_with_csv_submission_enabled_report')}"
6969
else
@@ -114,7 +114,7 @@ def csv_downloads; end
114114
def live_forms_csv
115115
forms = Reports::FormDocumentsService.live_form_documents
116116

117-
send_data Reports::FormsCsvReportService.new(forms).forms_csv,
117+
send_data Reports::FormsCsvReportService.new(forms).csv,
118118
type: "text/csv; charset=iso-8859-1",
119119
disposition: "attachment; filename=#{csv_filename('live_forms_report')}"
120120
end
@@ -128,7 +128,7 @@ def live_questions_csv
128128
Reports::FeatureReportService.new(forms).questions
129129
end
130130

131-
send_data Reports::QuestionsCsvReportService.new(questions).questions_csv,
131+
send_data Reports::QuestionsCsvReportService.new(questions).csv,
132132
type: "text/csv; charset=iso-8859-1",
133133
disposition: "attachment; filename=#{questions_csv_filename(answer_type)}"
134134
end

app/services/reports/forms_csv_report_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def initialize(form_documents)
3030
@form_documents = form_documents
3131
end
3232

33-
def forms_csv
33+
def csv
3434
CSV.generate do |csv|
3535
csv << FORM_CSV_HEADERS
3636

app/services/reports/questions_csv_report_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def initialize(question_page_documents)
3434
@question_page_documents = question_page_documents
3535
end
3636

37-
def questions_csv
37+
def csv
3838
CSV.generate do |csv|
3939
csv << QUESTIONS_CSV_HEADERS
4040

spec/services/reports/forms_csv_report_service_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
GroupForm.create!(form_id: 4, group:)
1717
end
1818

19-
describe "#forms_csv" do
19+
describe "#csv" do
2020
it "returns a CSV with a header row and a row for each form" do
21-
csv = csv_reports_service.forms_csv
21+
csv = csv_reports_service.csv
2222
rows = CSV.parse(csv)
2323
expect(rows.length).to eq 5
2424
end
2525

2626
it "has expected values" do
27-
csv = csv_reports_service.forms_csv
27+
csv = csv_reports_service.csv
2828
rows = CSV.parse(csv)
2929
expect(rows[1]).to eq([
3030
"1",

spec/services/reports/questions_csv_report_service_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
GroupForm.create!(form_id: 4, group:)
1818
end
1919

20-
describe "#questions_csv" do
20+
describe "#csv" do
2121
it "returns a CSV with a header row and a rows for each question" do
22-
csv = csv_reports_service.questions_csv
22+
csv = csv_reports_service.csv
2323
rows = CSV.parse(csv)
2424
expect(rows.length).to eq 18
2525
end
2626

2727
it "has expected values for text question" do
28-
csv = csv_reports_service.questions_csv
28+
csv = csv_reports_service.csv
2929
rows = CSV.parse(csv)
3030
text_question_row = rows.detect { |row| row.include? "Single line of text" }
3131
expect(text_question_row).to eq([
@@ -54,7 +54,7 @@
5454
end
5555

5656
it "has expected values for selection question" do
57-
csv = csv_reports_service.questions_csv
57+
csv = csv_reports_service.csv
5858
rows = CSV.parse(csv)
5959
selection_question_row = rows.detect { |row| row.include? "Selection from a list of options" }
6060
expect(selection_question_row).to eq([
@@ -83,7 +83,7 @@
8383
end
8484

8585
it "has expected values for name question" do
86-
csv = csv_reports_service.questions_csv
86+
csv = csv_reports_service.csv
8787
rows = CSV.parse(csv)
8888
name_question_row = rows.detect { |row| row.include? "What’s your name?" }
8989
expect(name_question_row).to eq([
@@ -112,7 +112,7 @@
112112
end
113113

114114
it "has expected values for question with routing conditions" do
115-
csv = csv_reports_service.questions_csv
115+
csv = csv_reports_service.csv
116116
rows = CSV.parse(csv)
117117
routing_question_row = rows.detect { |row| row.include? "How many times have you filled out this form?" }
118118
expect(routing_question_row).to eq([

0 commit comments

Comments
 (0)