baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge 240dfbc132 into 61477f1c2d

pull/3364/merge
Nat Dean-Lewis 4 days ago committed by GitHub
parent
61477f1c2d 240dfbc132
commit
c4050841f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 122 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Gemfile
  2. 167
      Gemfile.lock
  3. 2
      app/controllers/users_controller.rb
  4. 4
      app/models/download_record.rb
  5. 2
      app/models/location.rb
  6. 1
      app/models/log.rb
  7. 2
      app/views/locations/deactivate_confirm.html.erb
  8. 2
      app/views/schemes/deactivate_confirm.html.erb
  9. 4
      config/application.rb
  10. 22
      config/initializers/devise_two_factor_authentication_rails8_patch.rb
  11. 6
      spec/features/accessibility_spec.rb

7
Gemfile
Unescape View File

@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.4.9" ruby "3.4.9"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem "rails", "~> 7.2.2" gem "rails", "~> 8.1.3"
# Use postgresql as the database for Active Record # Use postgresql as the database for Active Record
gem "pg", "~> 1.1" gem "pg", "~> 1.1"
# Use Puma as the app server # Use Puma as the app server
@ -44,7 +44,7 @@ gem "view_component", "~> 4.9"
# Use the AWS S3 SDK as storage mechanism # Use the AWS S3 SDK as storage mechanism
gem "aws-sdk-s3" gem "aws-sdk-s3"
# Track changes to models for auditing or versioning. # Track changes to models for auditing or versioning.
gem "paper_trail", "~> 15.2" gem "paper_trail", "~> 17.0"
# Store active record objects in version whodunnits # Store active record objects in version whodunnits
gem "paper_trail-globalid" gem "paper_trail-globalid"
@ -75,9 +75,6 @@ gem "unread"
gem "nokogiri", "~> 1.19.1" gem "nokogiri", "~> 1.19.1"
gem "thor", "~> 1.4.0" gem "thor", "~> 1.4.0"
# Pinning until activesupport is updated to v8.1.2
gem "connection_pool", "~> 2.5"
group :development, :test do group :development, :test do
# Check gems for known vulnerabilities # Check gems for known vulnerabilities
gem "bundler-audit" gem "bundler-audit"

167
Gemfile.lock
Unescape View File

@ -1,83 +1,84 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.2.3.1) action_text-trix (2.1.19)
actionpack (= 7.2.3.1) railties
activesupport (= 7.2.3.1) actioncable (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.2.3.1) actionmailbox (8.1.3)
actionpack (= 7.2.3.1) actionpack (= 8.1.3)
activejob (= 7.2.3.1) activejob (= 8.1.3)
activerecord (= 7.2.3.1) activerecord (= 8.1.3)
activestorage (= 7.2.3.1) activestorage (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
mail (>= 2.8.0) mail (>= 2.8.0)
actionmailer (7.2.3.1) actionmailer (8.1.3)
actionpack (= 7.2.3.1) actionpack (= 8.1.3)
actionview (= 7.2.3.1) actionview (= 8.1.3)
activejob (= 7.2.3.1) activejob (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
mail (>= 2.8.0) mail (>= 2.8.0)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.2.3.1) actionpack (8.1.3)
actionview (= 7.2.3.1) actionview (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
cgi
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc rack (>= 2.2.4)
rack (>= 2.2.4, < 3.3)
rack-session (>= 1.0.1) rack-session (>= 1.0.1)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
useragent (~> 0.16) useragent (~> 0.16)
actiontext (7.2.3.1) actiontext (8.1.3)
actionpack (= 7.2.3.1) action_text-trix (~> 2.1.15)
activerecord (= 7.2.3.1) actionpack (= 8.1.3)
activestorage (= 7.2.3.1) activerecord (= 8.1.3)
activesupport (= 7.2.3.1) activestorage (= 8.1.3)
activesupport (= 8.1.3)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.2.3.1) actionview (8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
builder (~> 3.1) builder (~> 3.1)
cgi
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
activejob (7.2.3.1) activejob (8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.2.3.1) activemodel (8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
activemodel-serializers-xml (1.0.3) activemodel-serializers-xml (1.0.3)
activemodel (>= 5.0.0.a) activemodel (>= 5.0.0.a)
activesupport (>= 5.0.0.a) activesupport (>= 5.0.0.a)
builder (~> 3.1) builder (~> 3.1)
activerecord (7.2.3.1) activerecord (8.1.3)
activemodel (= 7.2.3.1) activemodel (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.2.3.1) activestorage (8.1.3)
actionpack (= 7.2.3.1) actionpack (= 8.1.3)
activejob (= 7.2.3.1) activejob (= 8.1.3)
activerecord (= 7.2.3.1) activerecord (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.2.3.1) activesupport (8.1.3)
base64 base64
benchmark (>= 0.3)
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1) concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5) connection_pool (>= 2.2.5)
drb drb
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
json
logger (>= 1.4.2) logger (>= 1.4.2)
minitest (>= 5.1, < 6) minitest (>= 5.1)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.9.0) addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0) public_suffix (>= 2.0.2, < 8.0)
ast (2.4.3) ast (2.4.3)
@ -115,7 +116,6 @@ GEM
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
base64 (0.3.0) base64 (0.3.0)
bcrypt (3.1.22) bcrypt (3.1.22)
benchmark (0.5.0)
better_html (2.2.0) better_html (2.2.0)
actionview (>= 7.0) actionview (>= 7.0)
activesupport (>= 7.0) activesupport (>= 7.0)
@ -149,13 +149,12 @@ GEM
capybara-screenshot (1.0.26) capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4) capybara (>= 1.0, < 4)
launchy launchy
cgi (0.5.2)
childprocess (5.0.0) childprocess (5.0.0)
coderay (1.1.3) coderay (1.1.3)
coercible (1.0.0) coercible (1.0.0)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.7) concurrent-ruby (1.3.8)
connection_pool (2.5.5) connection_pool (3.0.2)
crack (1.0.0) crack (1.0.0)
bigdecimal bigdecimal
rexml rexml
@ -190,7 +189,7 @@ GEM
drb (2.2.3) drb (2.2.3)
dumb_delegator (1.0.0) dumb_delegator (1.0.0)
encryptor (3.0.0) encryptor (3.0.0)
erb (6.0.4) erb (6.0.6)
erb_lint (0.9.0) erb_lint (0.9.0)
activesupport activesupport
better_html (>= 2.0.1) better_html (>= 2.0.1)
@ -223,7 +222,7 @@ GEM
fugit (1.12.2) fugit (1.12.2)
et-orbi (~> 1.4) et-orbi (~> 1.4)
raabro (~> 1.4) raabro (~> 1.4)
globalid (1.3.0) globalid (1.4.0)
activesupport (>= 6.1) activesupport (>= 6.1)
govuk-components (6.4.0) govuk-components (6.4.0)
html-attributes-utils (~> 1.0.0, >= 1.0.0) html-attributes-utils (~> 1.0.0, >= 1.0.0)
@ -253,7 +252,7 @@ GEM
jmespath (1.6.2) jmespath (1.6.2)
jsbundling-rails (1.3.0) jsbundling-rails (1.3.0)
railties (>= 6.0.0) railties (>= 6.0.0)
json (2.20.0) json (2.21.1)
json-schema (4.1.1) json-schema (4.1.1)
addressable (>= 2.8) addressable (>= 2.8)
jwt (3.2.0) jwt (3.2.0)
@ -281,22 +280,25 @@ GEM
loofah (2.25.2) loofah (2.25.2)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.12.0) nokogiri (>= 1.12.0)
mail (2.8.1) mail (2.9.1)
logger
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
marcel (1.0.4) marcel (1.2.1)
matrix (0.4.2) matrix (0.4.2)
method_source (1.1.0) method_source (1.1.0)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.27.0) minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
msgpack (1.8.3) msgpack (1.8.3)
multipart-post (2.4.1) multipart-post (2.4.1)
nested_form (0.3.2) nested_form (0.3.2)
net-http (0.9.1) net-http (0.9.1)
uri (>= 0.11.1) uri (>= 0.11.1)
net-imap (0.6.4.1) net-imap (0.6.6)
date date
net-protocol net-protocol
net-pop (0.1.2) net-pop (0.1.2)
@ -322,8 +324,8 @@ GEM
iniparse (~> 1.4) iniparse (~> 1.4)
rexml (~> 3.2) rexml (~> 3.2)
pagy (9.4.0) pagy (9.4.0)
paper_trail (15.2.0) paper_trail (17.0.0)
activerecord (>= 6.1) activerecord (>= 7.1)
request_store (~> 1.4) request_store (~> 1.4)
paper_trail-globalid (0.2.0) paper_trail-globalid (0.2.0)
globalid globalid
@ -336,7 +338,7 @@ GEM
racc racc
pg (1.5.5) pg (1.5.5)
possessive (1.0.1) possessive (1.0.1)
pp (0.6.3) pp (0.6.4)
prettyprint prettyprint
prettyprint (0.2.0) prettyprint (0.2.0)
prism (1.9.0) prism (1.9.0)
@ -351,9 +353,6 @@ GEM
pry-byebug (3.10.1) pry-byebug (3.10.1)
byebug (~> 11.0) byebug (~> 11.0)
pry (>= 0.13, < 0.15) pry (>= 0.13, < 0.15)
psych (5.3.1)
date
stringio
public_suffix (7.0.5) public_suffix (7.0.5)
puma (7.2.1) puma (7.2.1)
nio4r (~> 2.0) nio4r (~> 2.0)
@ -373,20 +372,20 @@ GEM
rack (>= 1.3) rack (>= 1.3)
rackup (2.3.1) rackup (2.3.1)
rack (>= 3) rack (>= 3)
rails (7.2.3.1) rails (8.1.3)
actioncable (= 7.2.3.1) actioncable (= 8.1.3)
actionmailbox (= 7.2.3.1) actionmailbox (= 8.1.3)
actionmailer (= 7.2.3.1) actionmailer (= 8.1.3)
actionpack (= 7.2.3.1) actionpack (= 8.1.3)
actiontext (= 7.2.3.1) actiontext (= 8.1.3)
actionview (= 7.2.3.1) actionview (= 8.1.3)
activejob (= 7.2.3.1) activejob (= 8.1.3)
activemodel (= 7.2.3.1) activemodel (= 8.1.3)
activerecord (= 7.2.3.1) activerecord (= 8.1.3)
activestorage (= 7.2.3.1) activestorage (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.2.3.1) railties (= 8.1.3)
rails-dom-testing (2.3.0) rails-dom-testing (2.3.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
@ -401,10 +400,9 @@ GEM
nested_form (~> 0.3) nested_form (~> 0.3)
rails (>= 6.0, < 9) rails (>= 6.0, < 9)
turbo-rails (>= 1.0, < 3) turbo-rails (>= 1.0, < 3)
railties (7.2.3.1) railties (8.1.3)
actionpack (= 7.2.3.1) actionpack (= 8.1.3)
activesupport (= 7.2.3.1) activesupport (= 8.1.3)
cgi
irb (~> 1.13) irb (~> 1.13)
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
@ -417,9 +415,14 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rdoc (7.2.0) rbs (4.1.0)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb erb
psych (>= 4.0.0) prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort tsort
redcarpet (3.6.0) redcarpet (3.6.0)
redis (4.8.1) redis (4.8.1)
@ -531,7 +534,6 @@ GEM
smart_properties (1.17.0) smart_properties (1.17.0)
stimulus-rails (1.3.3) stimulus-rails (1.3.3)
railties (>= 6.0.0) railties (>= 6.0.0)
stringio (3.2.0)
thor (1.4.0) thor (1.4.0)
thread_safe (0.3.6) thread_safe (0.3.6)
timecop (0.9.8) timecop (0.9.8)
@ -595,7 +597,6 @@ DEPENDENCIES
capybara capybara
capybara-lockstep capybara-lockstep
capybara-screenshot capybara-screenshot
connection_pool (~> 2.5)
cssbundling-rails cssbundling-rails
devise devise
devise_two_factor_authentication devise_two_factor_authentication
@ -615,7 +616,7 @@ DEPENDENCIES
nokogiri (~> 1.19.1) nokogiri (~> 1.19.1)
notifications-ruby-client notifications-ruby-client
overcommit (>= 0.37.0) overcommit (>= 0.37.0)
paper_trail (~> 15.2) paper_trail (~> 17.0)
paper_trail-globalid paper_trail-globalid
parallel_tests parallel_tests
pg (~> 1.1) pg (~> 1.1)
@ -627,7 +628,7 @@ DEPENDENCIES
rack (~> 3.1.20) rack (~> 3.1.20)
rack-attack rack-attack
rack-mini-profiler (~> 3.3.0) rack-mini-profiler (~> 3.3.0)
rails (~> 7.2.2) rails (~> 8.1.3)
rails_admin (~> 3.1) rails_admin (~> 3.1)
redcarpet (~> 3.6) redcarpet (~> 3.6)
redis (~> 4.8) redis (~> 4.8)

2
app/controllers/users_controller.rb
Unescape View File

@ -11,7 +11,7 @@ class UsersController < ApplicationController
before_action -> { filter_manager.serialize_filters_to_session }, if: :current_user, only: %i[index] before_action -> { filter_manager.serialize_filters_to_session }, if: :current_user, only: %i[index]
def index def index
redirect_to users_organisation_path(current_user.organisation) unless current_user.support? return redirect_to users_organisation_path(current_user.organisation) unless current_user.support? || request.format.csv?
all_users = User.visible.sorted_by_organisation_and_role all_users = User.visible.sorted_by_organisation_and_role
filtered_users = filter_manager.filtered_users(all_users, search_term, session_filters) filtered_users = filter_manager.filtered_users(all_users, search_term, session_filters)

4
app/models/download_record.rb
Unescape View File

@ -11,8 +11,8 @@ class DownloadRecord < ApplicationRecord
scheme_location: 3, scheme_location: 3,
}.freeze }.freeze
enum download_type: DOWNLOAD_TYPE enum :download_type, DOWNLOAD_TYPE
enum user_role: User::ROLES enum :user_role, User::ROLES
def self.build_from_user(user:, **attrs) def self.build_from_user(user:, **attrs)
new( new(

2
app/models/location.rb
Unescape View File

@ -172,7 +172,7 @@ class Location < ApplicationRecord
LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h
attribute :local_authorities, :string attribute :local_authorities, :string
enum :local_authorities, LOCAL_AUTHORITIES enum :local_authorities, LOCAL_AUTHORITIES if LOCAL_AUTHORITIES.present?
def self.local_authorities_for_current_year def self.local_authorities_for_current_year
LocalAuthority.all.active(Time.zone.today).england.map { |la| [la.code, la.name] }.to_h LocalAuthority.all.active(Time.zone.today).england.map { |la| [la.code, la.name] }.to_h
end end

1
app/models/log.rb
Unescape View File

@ -50,7 +50,6 @@ class Log < ApplicationRecord
scope :has_old_form_id, -> { where.not(old_form_id: nil) } scope :has_old_form_id, -> { where.not(old_form_id: nil) }
scope :imported_2023_with_old_form_id, -> { imported.filter_by_year(2023).has_old_form_id } scope :imported_2023_with_old_form_id, -> { imported.filter_by_year(2023).has_old_form_id }
scope :imported_2023, -> { imported.filter_by_year(2023) } scope :imported_2023, -> { imported.filter_by_year(2023) }
# TODO: CLDC-4273: use .union in filter_by_organisation rather than raw SQL
scope :filter_by_organisation, lambda { |orgs, _user = nil| scope :filter_by_organisation, lambda { |orgs, _user = nil|
owned = unscoped { where(owning_organisation: orgs).select(:id) } owned = unscoped { where(owning_organisation: orgs).select(:id) }
managed = unscoped { where(managing_organisation: orgs).select(:id) } managed = unscoped { where(managing_organisation: orgs).select(:id) }

2
app/views/locations/deactivate_confirm.html.erb
Unescape View File

@ -1,4 +1,4 @@
<%= form_with model: @location_deactivation_period, url: scheme_location_deactivate_path(@location), method: "patch", local: true do |f| %> <%= form_with url: scheme_location_deactivate_path(@location), method: "patch", local: true do |f| %>
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link(href: :back) %> <%= govuk_back_link(href: :back) %>
<% end %> <% end %>

2
app/views/schemes/deactivate_confirm.html.erb
Unescape View File

@ -1,4 +1,4 @@
<%= form_with model: @scheme_deactivation_period, url: scheme_deactivate_path(@scheme), method: "patch", local: true do |f| %> <%= form_with url: scheme_deactivate_path(@scheme), method: "patch", local: true do |f| %>
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link(href: :back) %> <%= govuk_back_link(href: :back) %>
<% end %> <% end %>

4
config/application.rb
Unescape View File

@ -20,8 +20,8 @@ Bundler.require(*Rails.groups)
module DataCollector module DataCollector
class Application < Rails::Application class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version. # Initialize configuration defaults for this Rails version.
config.load_defaults 7.2 config.load_defaults 8.1
# Please, add to the `ignore` list any other `lib` subdirectories that do # Please, add to the `ignore` list any other `lib` subdirectories that do
# not contain `.rb` files, or that should not be reloaded or eager loaded. # not contain `.rb` files, or that should not be reloaded or eager loaded.

22
config/initializers/devise_two_factor_authentication_rails8_patch.rb
Unescape View File

@ -0,0 +1,22 @@
# frozen_string_literal: true
# Compatibility patch for devise_two_factor_authentication 3.0.0 on Rails 8+.
#
# The gem's route mapper passes the non-standard :resend_code action into
# `resource ... only: [...]`. Rails 8 tightened `resource`/`resources` to raise
# an ArgumentError when :only/:except contain anything outside the standard REST
# actions. So, we redefine the mapper method here to drop it now we are on Rails 8+
module ActionDispatch::Routing
class Mapper
protected
def devise_two_factor_authentication(mapping, controllers)
resource :two_factor_authentication,
only: %i[show update],
path: mapping.path_names[:two_factor_authentication],
controller: controllers[:two_factor_authentication] do
collection { get resend_code_path(mapping), as: "resend_code" }
end
end
end
end

6
spec/features/accessibility_spec.rb
Unescape View File

@ -69,6 +69,7 @@ RSpec.describe "Accessibility", :js do
context "when viewing organisation pages" do context "when viewing organisation pages" do
let(:parent_relationship) { create(:organisation_relationship, parent_organisation: other_user.organisation) } let(:parent_relationship) { create(:organisation_relationship, parent_organisation: other_user.organisation) }
let(:child_relationship) { create(:organisation_relationship, child_organisation: other_user.organisation) } let(:child_relationship) { create(:organisation_relationship, child_organisation: other_user.organisation) }
let(:name_change) { create(:organisation_name_change, organisation: other_user.organisation) }
let(:organisation_paths) do let(:organisation_paths) do
routes = find_routes("organisation", other_user.organisation, other_user.organisation).reject do |route| routes = find_routes("organisation", other_user.organisation, other_user.organisation).reject do |route|
route.match?(/\A\/organisations\/#{other_user.organisation_id}\z/) || route.match?(/\A\/organisations\/#{other_user.organisation_id}\z/) ||
@ -81,12 +82,15 @@ RSpec.describe "Accessibility", :js do
"filters/update" => "?codes_only=false", "filters/update" => "?codes_only=false",
"stock-owners/remove" => "?target_organisation_id=#{child_relationship.parent_organisation.id}", "stock-owners/remove" => "?target_organisation_id=#{child_relationship.parent_organisation.id}",
"managing-agents/remove" => "?target_organisation_id=#{parent_relationship.child_organisation.id}", "managing-agents/remove" => "?target_organisation_id=#{parent_relationship.child_organisation.id}",
"organisations/search" => "?query=test",
} }
routes.map do |route| routes.map do |route|
additional_params = route_mappings.find { |pattern, _| route.include?(pattern) }&.last additional_params = route_mappings.find { |pattern, _| route.include?(pattern) }&.last
route += additional_params if additional_params route += additional_params if additional_params
route # find_routes does not substitute :change_id, so provide a real record id
# to visit the actual cancel-name-change page instead of an error page.
route.gsub(":change_id", name_change.id.to_s)
end end
end end

Write Preview
Loading…
Cancel
Save