Browse Source

refactor: rubocop autocorrect

pull/954/head
natdeanlewissoftwire 4 years ago
parent
commit
755719115a
  1. 6
      app/controllers/organisation_relationships_controller.rb
  2. 4
      spec/requests/organisations_controller_spec.rb

6
app/controllers/organisation_relationships_controller.rb

@ -49,15 +49,15 @@ class OrganisationRelationshipsController < ApplicationController
if related_organisation_id.empty?
@organisation.errors.add :related_organisation_id, "You must choose a housing provider"
@organisations = Organisation.where.not(id: child_organisation_id).pluck(:id, :name)
render 'organisation_relationships/add_housing_provider'
render "organisation_relationships/add_housing_provider"
return
elsif OrganisationRelationship.exists?(child_organisation_id:, parent_organisation_id:, relationship_type:)
@organisation.errors.add :related_organisation_id, "You have already added this housing provider"
@organisations = Organisation.where.not(id: child_organisation_id).pluck(:id, :name)
render 'organisation_relationships/add_housing_provider'
render "organisation_relationships/add_housing_provider"
return
end
create(child_organisation_id:, parent_organisation_id:, relationship_type:)
create!(child_organisation_id:, parent_organisation_id:, relationship_type:)
redirect_to housing_providers_organisation_path(related_organisation_id:)
end

4
spec/requests/organisations_controller_spec.rb

@ -554,7 +554,7 @@ RSpec.describe OrganisationsController, type: :request do
it "sets the organisation relationship attributes correctly" do
request
expect(OrganisationRelationship.exists?(child_organisation_id: organisation.id, parent_organisation_id: housing_provider.id, relationship_type: OrganisationRelationship::OWNING)).to be_truthy
expect(OrganisationRelationship).to exist(child_organisation_id: organisation.id, parent_organisation_id: housing_provider.id, relationship_type: OrganisationRelationship::OWNING)
end
it "redirects to the organisation list" do
@ -1421,7 +1421,7 @@ RSpec.describe OrganisationsController, type: :request do
it "sets the organisation relationship attributes correctly" do
request
expect(OrganisationRelationship.exists?(child_organisation_id: organisation.id, parent_organisation_id: housing_provider.id, relationship_type: OrganisationRelationship::OWNING)).to be_truthy
expect(OrganisationRelationship).to exist(child_organisation_id: organisation.id, parent_organisation_id: housing_provider.id, relationship_type: OrganisationRelationship::OWNING)
end
it "redirects to the organisation list" do

Loading…
Cancel
Save