diff --git a/app/models/log.rb b/app/models/log.rb index 24a42b04e..8847812d3 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -62,7 +62,7 @@ class Log < ApplicationRecord service = UprnClient.new(uprn) service.call - if service.result.blank? || service.error.present? + if service.error.present? errors.add(:uprn, :uprn_error, message: service.error) errors.add(:uprn_selection, :uprn_error, message: service.error) return diff --git a/spec/shared/shared_log_examples.rb b/spec/shared/shared_log_examples.rb index 0632967cb..ef9ba32e6 100644 --- a/spec/shared/shared_log_examples.rb +++ b/spec/shared/shared_log_examples.rb @@ -103,6 +103,7 @@ RSpec.shared_examples "shared log examples" do |log_type| allow_any_instance_of(UprnClient).to receive(:error).and_return(error_message) expect { log.process_uprn_change! }.to change { log.errors[:uprn] }.from([]).to([error_message]) + .and change { log.errors[:uprn_selection] }.from([]).to([error_message]) end end end @@ -176,18 +177,10 @@ RSpec.shared_examples "shared log examples" do |log_type| allow_any_instance_of(AddressClient).to receive(:call) allow_any_instance_of(AddressClient).to receive(:error).and_return(error_message) allow_any_instance_of(UprnClient).to receive(:call) - allow_any_instance_of(UprnClient).to receive(:result).and_return({ - "UPRN" => "UPRN", - "UDPRN" => "UDPRN", - "ADDRESS" => "full address", - "SUB_BUILDING_NAME" => "0", - "BUILDING_NAME" => "building name", - "THOROUGHFARE_NAME" => "thoroughfare", - "POST_TOWN" => "posttown", - "POSTCODE" => "postcode", - }) + allow_any_instance_of(UprnClient).to receive(:error).and_return(error_message) expect { log.process_address_change! }.to change { log.errors[:uprn_selection] }.from([]).to([error_message]) + .and change { log.errors[:uprn_selection] }.from([]).to([error_message]) end end end