diff --git a/app/webpacker/controllers/govukfrontend_controller.js b/app/webpacker/controllers/govukfrontend_controller.js index 505aa0eee..74af6408a 100644 --- a/app/webpacker/controllers/govukfrontend_controller.js +++ b/app/webpacker/controllers/govukfrontend_controller.js @@ -1,5 +1,5 @@ -import {initAll} from "govuk-frontend"; -import {Controller} from "@hotwired/stimulus"; +import { initAll } from "govuk-frontend"; +import { Controller } from "@hotwired/stimulus"; export default class extends Controller { connect() { diff --git a/config/application.rb b/config/application.rb index 65810044b..7bdbfb93e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -33,7 +33,5 @@ module DataCollector # config.eager_load_paths << Rails.root.join("extras") config.exceptions_app = routes - - config.action_view.form_with_generates_remote_forms = false end end diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb index 42c76ecf5..a8dd15b97 100644 --- a/spec/models/case_log_spec.rb +++ b/spec/models/case_log_spec.rb @@ -153,16 +153,7 @@ RSpec.describe Form, type: :model do end context "armed forces injured validation" do - it "must be answered if tenant was a regular or reserve in armed forces" do - expect { - CaseLog.create!(armedforces: "A current or former regular in the UK Armed Forces (excluding National Service)", - reservist: nil, - owning_organisation: owning_organisation, - managing_organisation: managing_organisation) - }.to raise_error(ActiveRecord::RecordInvalid) - end - - it "must be answered if tenant was not a regular or reserve in armed forces" do + it "must not be answered if tenant was not a regular or reserve in armed forces" do expect { CaseLog.create!(armedforces: "No", reservist: "Yes", @@ -466,15 +457,6 @@ RSpec.describe Form, type: :model do end context "armed forces active validation" do - it "must be answered if ever served in the forces as a regular" do - expect { - CaseLog.create!(armedforces: "A current or former regular in the UK Armed Forces (excluding National Service)", - leftreg: nil, - owning_organisation: owning_organisation, - managing_organisation: managing_organisation) - }.to raise_error(ActiveRecord::RecordInvalid) - end - it "must not be answered if not ever served as a regular" do expect { CaseLog.create!(armedforces: "No",