diff options
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 2 | ||||
| -rw-r--r-- | spec/models/chouette/vehicle_journey_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index 71c339780..19299d098 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -142,7 +142,7 @@ module Chouette vj.update_attributes(state_permited_attributes(item)) vj.update_has_and_belongs_to_many_from_state(item) - item['errors'] = vj.errors if vj.errors.any? + item['errors'] = vj.errors.full_messages.uniq if vj.errors.any? end # Delete ids of new object from state if we had to rollback diff --git a/spec/models/chouette/vehicle_journey_spec.rb b/spec/models/chouette/vehicle_journey_spec.rb index c78ef5b33..c495becac 100644 --- a/spec/models/chouette/vehicle_journey_spec.rb +++ b/spec/models/chouette/vehicle_journey_spec.rb @@ -10,7 +10,7 @@ describe Chouette::VehicleJourney, :type => :model do vehicle_journey.validate expect(vjas[0].errors[:departure_time]).not_to be_blank - expect(vehicle_journey.errors[:vehicle_journey_at_stops].count).to eq(1) + expect(vehicle_journey.errors.count).to eq(1) expect(vehicle_journey).not_to be_valid end @@ -19,7 +19,7 @@ describe Chouette::VehicleJourney, :type => :model do vehicle_journey.validate expect(vjas[0].errors[:departure_time]).to be_blank - expect(vehicle_journey.errors[:vehicle_journey_at_stops]).to be_empty + expect(vehicle_journey.errors).to be_empty expect(vehicle_journey).to be_valid end |