Browse Source

feat: use zero? where appropriate and lint

pull/1958/head
natdeanlewissoftwire 3 years ago
parent
commit
409dadbb8b
  1. 2
      app/controllers/schemes_controller.rb
  2. 4
      spec/helpers/schemes_helper_spec.rb
  3. 10
      spec/requests/schemes_controller_spec.rb

2
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

4
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" },

10
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

Loading…
Cancel
Save