From c1b95805e9a270e57c152a7e5f0ffeee77749638 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 20 Oct 2022 11:27:22 +0100 Subject: [PATCH] refactor: rubocop conciliation --- app/controllers/organisation_relationships_controller.rb | 1 - app/models/organisation.rb | 1 - spec/requests/organisations_controller_spec.rb | 8 ++++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb index 1bba91f19..98456ac7b 100644 --- a/app/controllers/organisation_relationships_controller.rb +++ b/app/controllers/organisation_relationships_controller.rb @@ -2,7 +2,6 @@ class OrganisationRelationshipsController < ApplicationController include Pagy::Backend include Modules::SearchFilter - before_action :authenticate_user! before_action :authenticate_scope! diff --git a/app/models/organisation.rb b/app/models/organisation.rb index 27230ead0..cc7bb49fd 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -16,7 +16,6 @@ class Organisation < ApplicationRecord has_many :housing_provider_relationships, -> { where(relationship_type: OrganisationRelationship::OWNING) }, foreign_key: :child_organisation_id, class_name: "OrganisationRelationship" has_many :housing_providers, through: :housing_provider_relationships, source: :parent_organisation - scope :search_by_name, ->(name) { where("name ILIKE ?", "%#{name}%") } scope :search_by, ->(param) { search_by_name(param) } has_paper_trail diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index efbd42afe..e5ea75d76 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -289,10 +289,10 @@ RSpec.describe OrganisationsController, type: :request do let!(:housing_provider) { FactoryBot.create(:organisation) } let!(:other_org_housing_provider) { FactoryBot.create(:organisation, name: "Foobar LTD") } let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD") } - let!(:organisation_relationship) { FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) } - let!(:other_organisation_relationship) { FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) } before do + FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) + FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_housing_rovider, relationship_type: OrganisationRelationship.relationship_types[:owning]) get "/organisations/#{organisation.id}/housing-providers", headers:, params: {} end @@ -531,10 +531,10 @@ RSpec.describe OrganisationsController, type: :request do let!(:housing_provider) { FactoryBot.create(:organisation) } let!(:other_org_housing_provider) { FactoryBot.create(:organisation, name: "Foobar LTD") } let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD") } - let!(:organisation_relationship) { FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) } - let!(:other_organisation_relationship) { FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) } before do + FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) + FactoryBot.create(:organisation_relationship, child_organisation: other_organisation, parent_organisation: other_org_housing_provider, relationship_type: OrganisationRelationship.relationship_types[:owning]) get "/organisations/#{organisation.id}/housing-providers", headers:, params: {} end