From 7fdd6260f37a8d7b336a36aa2cca05bde5d4f458 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Fri, 17 Jun 2022 16:56:09 +0100 Subject: [PATCH] All the things are green --- app/controllers/case_logs_controller.rb | 8 +++++--- app/models/form/setup/pages/organisation.rb | 2 +- app/models/form/setup/questions/owning_organisation_id.rb | 4 ++-- .../form/setup/questions/owning_organisation_id_spec.rb | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb index 86d09b32a..464f5aeef 100644 --- a/app/controllers/case_logs_controller.rb +++ b/app/controllers/case_logs_controller.rb @@ -29,11 +29,13 @@ class CaseLogsController < ApplicationController def create case_log = CaseLog.new(case_log_params) case_log.form.current_user = current_user - case_log.save respond_to do |format| - format.html { redirect_to case_log } + format.html do + case_log.save! + redirect_to case_log + end format.json do - if case_log.persisted? + if case_log.save render json: case_log, status: :created else render json: { errors: case_log.errors.messages }, status: :unprocessable_entity diff --git a/app/models/form/setup/pages/organisation.rb b/app/models/form/setup/pages/organisation.rb index b28c5a7a0..d02cf9b97 100644 --- a/app/models/form/setup/pages/organisation.rb +++ b/app/models/form/setup/pages/organisation.rb @@ -18,7 +18,7 @@ class Form::Setup::Pages::Organisation < ::Form::Page !!form.current_user&.support? end - def invalidated?(case_log) + def invalidated?(_case_log) false end end diff --git a/app/models/form/setup/questions/owning_organisation_id.rb b/app/models/form/setup/questions/owning_organisation_id.rb index 983d1752c..dc059a5fd 100644 --- a/app/models/form/setup/questions/owning_organisation_id.rb +++ b/app/models/form/setup/questions/owning_organisation_id.rb @@ -11,8 +11,8 @@ class Form::Setup::Questions::OwningOrganisationId < ::Form::Question end def answer_options_values - hsh = { "" => "Select an option" } - Organisation.all.each_with_object(hsh) do |organisation, hsh| + answer_opts = { "" => "Select an option" } + Organisation.all.each_with_object(answer_opts) do |organisation, hsh| hsh[organisation.id] = organisation.name hsh end diff --git a/spec/models/form/setup/questions/owning_organisation_id_spec.rb b/spec/models/form/setup/questions/owning_organisation_id_spec.rb index 3e372ab31..64eaf8326 100644 --- a/spec/models/form/setup/questions/owning_organisation_id_spec.rb +++ b/spec/models/form/setup/questions/owning_organisation_id_spec.rb @@ -12,9 +12,9 @@ RSpec.describe Form::Setup::Questions::OwningOrganisationId, type: :model do let!(:organisation_2) { FactoryBot.create(:organisation, name: "second test org") } let(:expected_answer_options) do { - "" => "Select an option", - organisation_1.id => organisation_1.name, - organisation_2.id => organisation_2.name, + "" => "Select an option", + organisation_1.id => organisation_1.name, + organisation_2.id => organisation_2.name, } end