|
|
|
@ -59,7 +59,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -103,7 +103,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -140,7 +140,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
expect(absorbing_organisation.child_organisations.count).to eq(3) |
|
|
|
@ -557,7 +557,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -590,7 +590,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
expect(absorbing_organisation.sales_logs.count).to eq(0) |
|
|
|
@ -652,7 +652,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
expect(absorbing_organisation.sales_logs.count).to eq(0) |
|
|
|
@ -688,7 +688,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
expect(absorbing_organisation.lettings_logs.count).to eq(0) |
|
|
|
@ -831,7 +831,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -950,7 +950,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1075,7 +1075,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(absorbing_organisation.id).and_return(absorbing_organisation) |
|
|
|
|
allow(absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1145,7 +1145,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1189,7 +1189,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1226,7 +1226,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
expect(new_absorbing_organisation.child_organisations.count).to eq(3) |
|
|
|
@ -1331,7 +1331,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1363,7 +1363,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
expect(new_absorbing_organisation.sales_logs.count).to eq(0) |
|
|
|
@ -1402,7 +1402,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
expect(new_absorbing_organisation.sales_logs.count).to eq(0) |
|
|
|
@ -1438,7 +1438,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
expect(new_absorbing_organisation.lettings_logs.count).to eq(0) |
|
|
|
@ -1544,7 +1544,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1634,7 +1634,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
@ -1676,7 +1676,7 @@ RSpec.describe Merge::MergeOrganisationsService do
|
|
|
|
|
allow(Organisation).to receive(:find).with(new_absorbing_organisation.id).and_return(new_absorbing_organisation) |
|
|
|
|
allow(new_absorbing_organisation).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) |
|
|
|
|
expect(Rails.logger).to receive(:error).with("Organisation merge failed with: Record invalid") |
|
|
|
|
merge_organisations_service.call |
|
|
|
|
expect { merge_organisations_service.call }.to raise_error(ActiveRecord::RecordInvalid) |
|
|
|
|
|
|
|
|
|
new_absorbing_organisation.reload |
|
|
|
|
merging_organisation.reload |
|
|
|
|