Merge branch 'main' into dependabot/bundler/govuk_design_system_formb…

…uilder-5.0.0

CHANGELOG.md

@@ -89,7 +89,31 @@
 
 **Merged pull requests:**
 
+- updating defra\_ruby\_area dependency [\#706](https://github.com/DEFRA/flood-risk-engine/pull/706) ([brujeo](https://github.com/brujeo))
+- updating rubocop and fixing code style issues [\#704](https://github.com/DEFRA/flood-risk-engine/pull/704) ([brujeo](https://github.com/brujeo))
+- update defra\_ruby\_area [\#703](https://github.com/DEFRA/flood-risk-engine/pull/703) ([brujeo](https://github.com/brujeo))
+- Bump factory\_bot\_rails from 6.2.0 to 6.4.2 [\#701](https://github.com/DEFRA/flood-risk-engine/pull/701) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump net-imap from 0.4.5 to 0.4.6 [\#700](https://github.com/DEFRA/flood-risk-engine/pull/700) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.15.4 to 1.15.5 [\#698](https://github.com/DEFRA/flood-risk-engine/pull/698) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump bullet from 7.1.3 to 7.1.4 [\#696](https://github.com/DEFRA/flood-risk-engine/pull/696) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump phonelib from 0.8.2 to 0.8.5 [\#694](https://github.com/DEFRA/flood-risk-engine/pull/694) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump bullet from 7.0.7 to 7.1.3 [\#693](https://github.com/DEFRA/flood-risk-engine/pull/693) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump net-imap from 0.3.7 to 0.4.5 [\#692](https://github.com/DEFRA/flood-risk-engine/pull/692) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump phonelib from 0.8.2 to 0.8.5 [\#690](https://github.com/DEFRA/flood-risk-engine/pull/690) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump pg from 1.5.3 to 1.5.4 [\#682](https://github.com/DEFRA/flood-risk-engine/pull/682) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump activerecord-session\_store from 2.0.0 to 2.1.0 [\#681](https://github.com/DEFRA/flood-risk-engine/pull/681) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump govuk\_design\_system\_formbuilder from 4.0.0 to 4.1.1 [\#678](https://github.com/DEFRA/flood-risk-engine/pull/678) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump webmock from 3.18.1 to 3.19.1 [\#676](https://github.com/DEFRA/flood-risk-engine/pull/676) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump net-smtp from 0.3.3 to 0.4.0 [\#675](https://github.com/DEFRA/flood-risk-engine/pull/675) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update CHANGELOG [\#672](https://github.com/DEFRA/flood-risk-engine/pull/672) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Bump nokogiri from 1.15.2 to 1.15.4 [\#668](https://github.com/DEFRA/flood-risk-engine/pull/668) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rails from 7.0.5 to 7.0.7 [\#667](https://github.com/DEFRA/flood-risk-engine/pull/667) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump protocol-http1 from 0.15.0 to 0.15.1 [\#663](https://github.com/DEFRA/flood-risk-engine/pull/663) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump net-imap from 0.3.4 to 0.3.7 [\#660](https://github.com/DEFRA/flood-risk-engine/pull/660) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump defra\_ruby\_validators from 2.5.1 to 2.5.2 [\#652](https://github.com/DEFRA/flood-risk-engine/pull/652) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump jquery-rails from 4.5.1 to 4.6.0 [\#650](https://github.com/DEFRA/flood-risk-engine/pull/650) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump vcr from 6.1.0 to 6.2.0 [\#649](https://github.com/DEFRA/flood-risk-engine/pull/649) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump capybara from 3.39.1 to 3.39.2 [\#643](https://github.com/DEFRA/flood-risk-engine/pull/643) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Feature/ruby 2480 frae tech upgrade to rails 7 [\#641](https://github.com/DEFRA/flood-risk-engine/pull/641) ([brujeo](https://github.com/brujeo))
 - Update CHANGELOG [\#634](https://github.com/DEFRA/flood-risk-engine/pull/634) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
 - Bump nokogiri from 1.14.3 to 1.15.0 [\#633](https://github.com/DEFRA/flood-risk-engine/pull/633) ([dependabot[bot]](https://github.com/apps/dependabot))

Gemfile

@@ -7,8 +7,6 @@ source "https://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem "rails", "~> 7.0"
-
 group :development, :test do
   # Pretty prints objects in console. Usage `$ ap some_object`
   gem "awesome_print"
@@ -17,8 +15,9 @@ group :development, :test do
   gem "bullet"
   # Call "byebug" anywhere in the code to stop execution and get a debugger
   # console
-  gem "byebug", "~> 11" # 11.1 only supports Ruby 2.4 and up
+  gem "byebug"
   gem "defra_ruby_style"
+  gem "faraday-retry"
   # Allows us to automatically generate the change log from the tags, issues,
   # labels and pull requests on GitHub. Added as a dependency so all dev's have
   # access to it to generate a log, and so they are using the same version.
@@ -35,15 +34,14 @@ end
 
 group :test do
   gem "capybara", "~> 3"
-  gem "database_cleaner", "~> 2"
   gem "factory_bot_rails", "~> 6"
   gem "faker", "~> 2"
   gem "govuk_design_system_formbuilder"
   gem "poltergeist", "~> 1" # Needed for headless testing with Javascript or pages that ref external sites
   gem "rails-controller-testing"
   gem "rspec-html-matchers"
-  gem "rspec-rails", "~> 5"
-  gem "shoulda-matchers", "~> 4.5", require: false
+  gem "rspec-rails", "~> 6"
+  gem "shoulda-matchers", "~> 6", require: false
   gem "simplecov", "~> 0.17.1", require: false
   gem "vcr", "~> 6"
   gem "webmock", "~> 3"