From 409dadbb8b5bacccdb10602d52cb6f1f9b9fd150 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 6 Oct 2023 12:27:51 +0100 Subject: [PATCH] feat: use zero? where appropriate and lint --- app/controllers/schemes_controller.rb | 2 +- spec/helpers/schemes_helper_spec.rb | 4 ++-- spec/requests/schemes_controller_spec.rb | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 908cc65f8..92669bcbe 100644 --- a/app/controllers/schemes_controller.rb +++ b/app/controllers/schemes_controller.rb @@ -273,7 +273,7 @@ private required_params[:sensitive] = required_params[:sensitive].to_i if required_params[:sensitive] - if current_user.data_coordinator? && current_user.organisation.stock_owners.blank? + if current_user.data_coordinator? && current_user.organisation.stock_owners.count.zero? required_params[:owning_organisation_id] = current_user.organisation_id end required_params diff --git a/spec/helpers/schemes_helper_spec.rb b/spec/helpers/schemes_helper_spec.rb index 9b5f72a58..6d9053820 100644 --- a/spec/helpers/schemes_helper_spec.rb +++ b/spec/helpers/schemes_helper_spec.rb @@ -139,7 +139,7 @@ RSpec.describe SchemesHelper do { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, - { name: "Housing stock owned by", value: "Acme LTD Owning", edit: true}, + { name: "Housing stock owned by", value: "Acme LTD Owning", edit: true }, { name: "Support services provided by", value: "A registered charity or voluntary organisation" }, { name: "Primary client group", value: "Rough sleepers" }, { name: "Has another client group", value: "Yes" }, @@ -185,7 +185,7 @@ RSpec.describe SchemesHelper do { name: "Confidential information", value: "No", edit: true }, { name: "Type of scheme", value: "Housing for older people" }, { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" }, - { name: "Housing stock owned by", value: "Acme LTD Owning", edit: true}, + { name: "Housing stock owned by", value: "Acme LTD Owning", edit: true }, { name: "Support services provided by", value: "A registered charity or voluntary organisation" }, { name: "Primary client group", value: "Rough sleepers" }, { name: "Has another client group", value: "Yes" }, diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb index de46815f2..af2d94666 100644 --- a/spec/requests/schemes_controller_spec.rb +++ b/spec/requests/schemes_controller_spec.rb @@ -820,10 +820,10 @@ RSpec.describe SchemesController, type: :request do context "when there are no stock owners" do let(:params) do { scheme: { service_name: " testy ", - sensitive: "1", - scheme_type: "Foyer", - registered_under_care_act: "No", - arrangement_type: "D" } } + sensitive: "1", + scheme_type: "Foyer", + registered_under_care_act: "No", + arrangement_type: "D" } } end before do @@ -931,7 +931,7 @@ RSpec.describe SchemesController, type: :request do scheme_type: "", registered_under_care_act: "", arrangement_type: "", - owning_organisation_id: ""} } + owning_organisation_id: "" } } end it "renders the same page with error message" do