rubocop

app/controllers/schemes_controller.rb

@@ -85,9 +85,9 @@ class SchemesController < ApplicationController
     render "schemes/check_answers"
   end
 
-  private
+private
 
-  def next_page_path page
+  def next_page_path(page)
     case page
     when "primary-client-group"
       scheme_confirm_secondary_client_group_path(@scheme)

spec/features/schemes_spec.rb

@@ -386,7 +386,7 @@ RSpec.describe "Schemes scheme Features" do
                       assert_selector "a", text: "Change", count: 12
                     end
 
-                    context "changing details" do
+                    context "when changing details" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/details?check_answers=true", match: :first)
                       end
@@ -416,7 +416,7 @@ RSpec.describe "Schemes scheme Features" do
                       end
                     end
 
-                    context "changing primary client group" do
+                    context "when changing primary client group" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/primary-client-group?check_answers=true")
                       end
@@ -443,7 +443,7 @@ RSpec.describe "Schemes scheme Features" do
                       end
                     end
 
-                    context "changing confirm secondary group answer" do
+                    context "when changing confirm secondary group answer" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/confirm-secondary-client-group?check_answers=true")
                       end
@@ -475,7 +475,7 @@ RSpec.describe "Schemes scheme Features" do
                       end
                     end
 
-                    context "allows changing confirm-secondary-client-group question to no" do
+                    context "when allows changing confirm-secondary-client-group question to no" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/confirm-secondary-client-group?check_answers=true")
                       end
@@ -491,7 +491,7 @@ RSpec.describe "Schemes scheme Features" do
                       end
                     end
 
-                    context "changing secondary-client-group question" do
+                    context "when changing secondary-client-group question" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/secondary-client-group?check_answers=true")
                       end
@@ -518,7 +518,7 @@ RSpec.describe "Schemes scheme Features" do
                       end
                     end
 
-                    context "changing support questions" do
+                    context "when changing support questions" do
                       before do
                         click_link("Change", href: "/schemes/#{scheme.id}/support?check_answers=true", match: :first)
                       end

spec/requests/schemes_controller_spec.rb

@@ -531,7 +531,7 @@ RSpec.describe SchemesController, type: :request do
         sign_in user
       end
 
-      it "creates a new scheme for user organisation with valid params" do
+      it "creates a new scheme for user organisation with valid params and renders correct page" do
         expect { post "/schemes", params: }.to change(Scheme, :count).by(1)
         expect(response).to have_http_status(:ok)
         expect(page).to have_content("What client group is this scheme intended for?")
@@ -556,7 +556,7 @@ RSpec.describe SchemesController, type: :request do
     end
 
     context "when signed in as a support user" do
-      let(:organisation)  { FactoryBot.create(:organisation) }
+      let(:organisation) { FactoryBot.create(:organisation) }
       let(:user) { FactoryBot.create(:user, :support) }
       let(:params) { { scheme: { service_name: "testy", sensitive: "1", scheme_type: "Foyer", registered_under_care_act: "No", total_units: "1", organisation_id: organisation.id } } }
 
@@ -565,7 +565,7 @@ RSpec.describe SchemesController, type: :request do
         sign_in user
       end
 
-      it "creates a new scheme for user organisation with valid params" do
+      it "creates a new scheme for user organisation with valid params and renders correct page" do
         expect { post "/schemes", params: }.to change(Scheme, :count).by(1)
         expect(response).to have_http_status(:ok)
         expect(page).to have_content("What client group is this scheme intended for?")
@@ -589,7 +589,7 @@ RSpec.describe SchemesController, type: :request do
       end
 
       context "when required organisation id param is missing" do
-        let(:params) { { "scheme"=> {"service_name"=>"qweqwer", "sensitive"=>"Yes", "organisation_id"=>"", "scheme_type"=>"Foyer", "registered_under_care_act"=>"Yes – part registered as a care home", "total_units"=>"1" } } }
+        let(:params) { { "scheme" => { "service_name" => "qweqwer", "sensitive" => "Yes", "organisation_id" => "", "scheme_type" => "Foyer", "registered_under_care_act" => "Yes – part registered as a care home", "total_units" => "1" } } }
 
         it "displays the new page with an error message" do
           post "/schemes", params: params
@@ -624,7 +624,7 @@ RSpec.describe SchemesController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let(:scheme_to_update) { FactoryBot.create(:scheme, :organisation => user.organisation) }
+      let(:scheme_to_update) { FactoryBot.create(:scheme, organisation: user.organisation) }
 
       context "when updating primary client group" do
         let(:params) { { scheme: { primary_client_group: "Homeless families with support needs", page: "primary-client-group" } } }