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

refactor: - changes

pull/1104/head
natdeanlewissoftwire 4 years ago
parent
3e003223a7
commit
f84abf3eed
10 changed files with 39 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/components/search_component.rb
  2. 2
      app/helpers/navigation_items_helper.rb
  3. 4
      app/models/form/lettings/pages/stock_owner.rb
  4. 2
      app/models/form/lettings/questions/stock_owner.rb
  5. 2
      app/models/form/lettings/subsections/setup.rb
  6. 10
      config/routes.rb
  7. 22
      spec/helpers/navigation_items_helper_spec.rb
  8. 2
      spec/models/form/lettings/pages/stock_owner_spec.rb
  9. 2
      spec/models/form/lettings/questions/stock_owner_spec.rb
  10. 30
      spec/requests/organisation_relationships_controller_spec.rb

2
app/components/search_component.rb
Unescape View File

@ -15,7 +15,7 @@ class SearchComponent < ViewComponent::Base
request.path
elsif request.path.include?("organisations") && request.path.include?("schemes")
request.path
elsif request.path.include?("organisations") && request.path.include?("housing-providers")
elsif request.path.include?("organisations") && request.path.include?("stock-owners")
request.path
elsif request.path.include?("organisations") && request.path.include?("managing-agents")
request.path

2
app/helpers/navigation_items_helper.rb
Unescape View File

@ -105,7 +105,7 @@ private
end
def stock_owners_path?(path)
path.include?("/housing-providers")
path.include?("/stock-owners")
end
def managing_agents_path?(path)

4
app/models/form/lettings/pages/stock_owner.rb
Unescape View File

@ -1,4 +1,4 @@
class Form::Lettings::Pages::HousingProvider < ::Form::Page
class Form::Lettings::Pages::StockOwner < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "stock_owner"
@ -9,7 +9,7 @@ class Form::Lettings::Pages::HousingProvider < ::Form::Page
def questions
@questions ||= [
Form::Lettings::Questions::HousingProvider.new(nil, nil, self),
Form::Lettings::Questions::StockOwner.new(nil, nil, self),
]
end

2
app/models/form/lettings/questions/stock_owner.rb
Unescape View File

@ -1,4 +1,4 @@
class Form::Lettings::Questions::HousingProvider < ::Form::Question
class Form::Lettings::Questions::StockOwner < ::Form::Question
attr_accessor :current_user, :log
def initialize(id, hsh, page)

2
app/models/form/lettings/subsections/setup.rb
Unescape View File

@ -38,7 +38,7 @@ private
def stock_owner_page
return unless FeatureToggle.managing_for_other_user_enabled?
Form::Lettings::Pages::HousingProvider.new(nil, nil, self)
Form::Lettings::Pages::StockOwner.new(nil, nil, self)
end
def managing_organisation_page

10
config/routes.rb
Unescape View File

@ -91,11 +91,11 @@ Rails.application.routes.draw do
post "logs/email-csv", to: "organisations#email_csv"
get "logs/csv-confirmation", to: "lettings_logs#csv_confirmation"
get "schemes", to: "organisations#schemes"
get "housing-providers", to: "organisation_relationships#stock_owners"
get "housing-providers/add", to: "organisation_relationships#add_stock_owner"
get "housing-providers/remove", to: "organisation_relationships#remove_stock_owner"
post "housing-providers", to: "organisation_relationships#create_stock_owner"
delete "housing-providers", to: "organisation_relationships#delete_stock_owner"
get "stock-owners", to: "organisation_relationships#stock_owners"
get "stock-owners/add", to: "organisation_relationships#add_stock_owner"
get "stock-owners/remove", to: "organisation_relationships#remove_stock_owner"
post "stock-owners", to: "organisation_relationships#create_stock_owner"
delete "stock-owners", to: "organisation_relationships#delete_stock_owner"
get "managing-agents", to: "organisation_relationships#managing_agents"
get "managing-agents/add", to: "organisation_relationships#add_managing_agent"
get "managing-agents/remove", to: "organisation_relationships#remove_managing_agent"

22
spec/helpers/navigation_items_helper_spec.rb
Unescape View File

@ -346,7 +346,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -364,7 +364,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -382,7 +382,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, true),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -400,7 +400,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", users_path, false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, true),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -418,7 +418,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -436,7 +436,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", true),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -454,7 +454,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/schemes", true),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About your organisation", organisation_path, false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -632,7 +632,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -662,7 +662,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", true),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -692,7 +692,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", true),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end
@ -722,7 +722,7 @@ RSpec.describe NavigationItemsHelper do
NavigationItemsHelper::NavigationItem.new("Schemes", "/organisations/#{current_user.organisation.id}/schemes", false),
NavigationItemsHelper::NavigationItem.new("Users", "/organisations/#{current_user.organisation.id}/users", false),
NavigationItemsHelper::NavigationItem.new("About this organisation", "/organisations/#{current_user.organisation.id}", true),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/housing-providers", false),
NavigationItemsHelper::NavigationItem.new("Stock owners", "/organisations/#{current_user.organisation.id}/stock-owners", false),
NavigationItemsHelper::NavigationItem.new("Managing agents", "/organisations/#{current_user.organisation.id}/managing-agents", false),
]
end

2
spec/models/form/lettings/pages/stock_owner_spec.rb
Unescape View File

@ -1,6 +1,6 @@
require "rails_helper"
RSpec.describe Form::Lettings::Pages::HousingProvider, type: :model do
RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection) }
let(:page_id) { nil }

2
spec/models/form/lettings/questions/stock_owner_spec.rb
Unescape View File

@ -1,6 +1,6 @@
require "rails_helper"
RSpec.describe Form::Lettings::Questions::HousingProvider, type: :model do
RSpec.describe Form::Lettings::Questions::StockOwner, type: :model do
subject(:question) { described_class.new(question_id, question_definition, page) }
let(:question_id) { nil }

30
spec/requests/organisation_relationships_controller_spec.rb
Unescape View File

@ -23,7 +23,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
before do
FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_stock_owner)
get "/organisations/#{organisation.id}/housing-providers", headers:, params: {}
get "/organisations/#{organisation.id}/stock-owners", headers:, params: {}
end
it "shows the tab navigation" do
@ -52,7 +52,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
context "when adding a stock owner" do
before do
get "/organisations/#{organisation.id}/housing-providers/add", headers:, params: {}
get "/organisations/#{organisation.id}/stock-owners/add", headers:, params: {}
end
it "has the correct header" do
@ -67,7 +67,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do
before do
get "/organisations/#{unauthorised_organisation.id}/housing-providers", headers:, params: {}
get "/organisations/#{unauthorised_organisation.id}/stock-owners", headers:, params: {}
end
it "returns not found 404 from users page" do
@ -145,7 +145,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
}
end
let(:request) { post "/organisations/#{organisation.id}/housing-providers", headers:, params: }
let(:request) { post "/organisations/#{organisation.id}/stock-owners", headers:, params: }
it "creates a new organisation relationship" do
expect { request }.to change(OrganisationRelationship, :count).by(1)
@ -158,7 +158,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
it "redirects to the organisation list" do
request
expect(response).to redirect_to("/organisations/#{organisation.id}/housing-providers")
expect(response).to redirect_to("/organisations/#{organisation.id}/stock-owners")
end
end
@ -197,7 +197,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
"target_organisation_id": stock_owner.id,
}
end
let(:request) { delete "/organisations/#{organisation.id}/housing-providers", headers:, params: }
let(:request) { delete "/organisations/#{organisation.id}/stock-owners", headers:, params: }
before do
FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
@ -209,7 +209,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
it "redirects to the organisation list" do
request
expect(response).to redirect_to("/organisations/#{organisation.id}/housing-providers")
expect(response).to redirect_to("/organisations/#{organisation.id}/stock-owners")
end
end
@ -257,7 +257,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
before do
FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_stock_owner)
get "/organisations/#{organisation.id}/housing-providers", headers:, params: {}
get "/organisations/#{organisation.id}/stock-owners", headers:, params: {}
end
it "shows the tab navigation" do
@ -287,7 +287,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do
before do
get "/organisations/#{unauthorised_organisation.id}/housing-providers", headers:, params: {}
get "/organisations/#{unauthorised_organisation.id}/stock-owners", headers:, params: {}
end
it "returns not found 404 from users page" do
@ -374,7 +374,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
}
end
let(:request) { post "/organisations/#{organisation.id}/housing-providers", headers:, params: }
let(:request) { post "/organisations/#{organisation.id}/stock-owners", headers:, params: }
it "creates a new organisation relationship" do
expect { request }.to change(OrganisationRelationship, :count).by(1)
@ -387,7 +387,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
it "redirects to the organisation list" do
request
expect(response).to redirect_to("/organisations/#{organisation.id}/housing-providers")
expect(response).to redirect_to("/organisations/#{organisation.id}/stock-owners")
end
end
@ -426,7 +426,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
"target_organisation_id": stock_owner.id,
}
end
let(:request) { delete "/organisations/#{organisation.id}/housing-providers", headers:, params: }
let(:request) { delete "/organisations/#{organisation.id}/stock-owners", headers:, params: }
before do
FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
@ -438,7 +438,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
it "redirects to the organisation list" do
request
expect(response).to redirect_to("/organisations/#{organisation.id}/housing-providers")
expect(response).to redirect_to("/organisations/#{organisation.id}/stock-owners")
end
end
@ -477,7 +477,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
before do
FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_stock_owner)
get "/organisations/#{organisation.id}/housing-providers", headers:, params: {}
get "/organisations/#{organisation.id}/stock-owners", headers:, params: {}
end
it "displays the name of the organisation" do
@ -510,7 +510,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
context "when adding a stock owner" do
before do
get "/organisations/#{organisation.id}/housing-providers/add", headers:, params: {}
get "/organisations/#{organisation.id}/stock-owners/add", headers:, params: {}
end
it "has the correct header" do

Write Preview
Loading…
Cancel
Save