From 90bf0c0ef87d820b108433051d8663ea8ac0f986 Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Tue, 2 May 2023 15:03:39 +0100
Subject: [PATCH] fix linter complaints

---
 spec/factories/page.rb                          | 12 ++++++------
 spec/factories/subsection.rb                    | 10 +++++-----
 spec/services/csv/sales_log_csv_service_spec.rb |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/factories/page.rb b/spec/factories/page.rb
index fb3e7a9e0..2b5b27969 100644
--- a/spec/factories/page.rb
+++ b/spec/factories/page.rb
@@ -9,12 +9,12 @@ FactoryBot.define do
       end
 
       after :build do |page, evaluator|
-        if q = evaluator.question
-          q.page = page
-          page.questions = [q]
-        elsif
-          page.questions = [build(:question, id: evaluator.question_id, page:)]
-        end
+        page.questions = if (q = evaluator.question)
+                           q.page = page
+                           [q]
+                         else
+                           [build(:question, id: evaluator.question_id, page:)]
+                         end
       end
     end
   end
diff --git a/spec/factories/subsection.rb b/spec/factories/subsection.rb
index 8b3b2480f..f4e4b307e 100644
--- a/spec/factories/subsection.rb
+++ b/spec/factories/subsection.rb
@@ -9,11 +9,11 @@ FactoryBot.define do
       end
 
       after :build do |subsection, evaluator|
-        if evaluator.questions
-          subsection.pages = evaluator.questions.map { |question| build(:page, :with_question, question:, subsection:) }
-        else
-          subsection.pages = evaluator.question_ids.map { |id| build(:page, :with_question, question_id: id, subsection:) }
-        end
+        subsection.pages = if evaluator.questions
+                             evaluator.questions.map { |question| build(:page, :with_question, question:, subsection:) }
+                           else
+                             evaluator.question_ids.map { |question_id| build(:page, :with_question, question_id:, subsection:) }
+                           end
       end
     end
   end
diff --git a/spec/services/csv/sales_log_csv_service_spec.rb b/spec/services/csv/sales_log_csv_service_spec.rb
index ace173fa1..96099aa70 100644
--- a/spec/services/csv/sales_log_csv_service_spec.rb
+++ b/spec/services/csv/sales_log_csv_service_spec.rb
@@ -40,12 +40,12 @@ RSpec.describe Csv::SalesLogCsvService do
       allow(form_handler_mock).to receive(:ordered_sales_questions_for_all_years).and_return(sales_form.questions)
     end
 
-    context "to return questions with particular ids" do
+    context "when it returns questions with particular ids" do
       let(:question_ids) { %w[type age1 buy1livein exdate] }
 
       it "includes log attributes related to questions to the headers" do
         headers = csv.first
-        expect(headers).to include *question_ids.first(3)
+        expect(headers).to include(*question_ids.first(3))
       end
 
       it "removes some log attributes related to questions from the headers and replaces them with their derived values in the correct order" do
@@ -55,7 +55,7 @@ RSpec.describe Csv::SalesLogCsvService do
       end
     end
 
-    context "to return questions with particular features" do
+    context "when it returns questions with particular features" do
       let(:questions) do
         [
           build(:question, id: "attribute_value_check", type: "interruption_screen"),