diff options
| author | Zog | 2018-03-12 15:28:56 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-03-14 15:32:39 +0100 |
| commit | 18ae1f30c497f2ec7f4e9bcd2eb4966dad8e67ba (patch) | |
| tree | 39b33d621b364d1e99a3911aaa6f9a6d34ec77b8 | |
| parent | 8aa258ab7bea85e423ed98b4d864ba7ab5481c13 (diff) | |
| download | chouette-core-18ae1f30c497f2ec7f4e9bcd2eb4966dad8e67ba.tar.bz2 | |
Refs #6021: Make DAY_OFFSET_MAX configurable
| -rw-r--r-- | app/models/chouette/vehicle_journey_at_stop.rb | 8 | ||||
| -rw-r--r-- | spec/models/chouette/vehicle_journey_at_stop_spec.rb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb index 9ea918ca5..3f5bd5abf 100644 --- a/app/models/chouette/vehicle_journey_at_stop.rb +++ b/app/models/chouette/vehicle_journey_at_stop.rb @@ -6,6 +6,8 @@ module Chouette DAY_OFFSET_MAX = 2 + @@day_offset_max = DAY_OFFSET_MAX + mattr_accessor :day_offset_max belongs_to :stop_point belongs_to :vehicle_journey @@ -40,7 +42,7 @@ module Chouette I18n.t( 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max', short_id: vehicle_journey&.get_objectid&.short_id, - max: DAY_OFFSET_MAX + 1 + max: Chouette::VehicleJourneyAtStop.day_offset_max + 1 ) ) end @@ -51,7 +53,7 @@ module Chouette I18n.t( 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max', short_id: vehicle_journey&.get_objectid&.short_id, - max: DAY_OFFSET_MAX + 1 + max: Chouette::VehicleJourneyAtStop.day_offset_max + 1 ) ) end @@ -62,7 +64,7 @@ module Chouette # nil offsets. Handle these gracefully by forcing them to a 0 offset. offset ||= 0 - offset < 0 || offset > DAY_OFFSET_MAX + offset < 0 || offset > Chouette::VehicleJourneyAtStop.day_offset_max end def checksum_attributes diff --git a/spec/models/chouette/vehicle_journey_at_stop_spec.rb b/spec/models/chouette/vehicle_journey_at_stop_spec.rb index f79d19c88..ae9823243 100644 --- a/spec/models/chouette/vehicle_journey_at_stop_spec.rb +++ b/spec/models/chouette/vehicle_journey_at_stop_spec.rb @@ -27,13 +27,13 @@ RSpec.describe Chouette::VehicleJourneyAtStop, type: :model do it "disallows offsets greater than DAY_OFFSET_MAX" do expect(at_stop.day_offset_outside_range?( - Chouette::VehicleJourneyAtStop::DAY_OFFSET_MAX + 1 + Chouette::VehicleJourneyAtStop.day_offset_max + 1 )).to be true end it "allows offsets between 0 and DAY_OFFSET_MAX inclusive" do expect(at_stop.day_offset_outside_range?( - Chouette::VehicleJourneyAtStop::DAY_OFFSET_MAX + Chouette::VehicleJourneyAtStop.day_offset_max )).to be false end @@ -79,7 +79,7 @@ RSpec.describe Chouette::VehicleJourneyAtStop, type: :model do describe "#validate" do it "displays the proper error message when day offset exceeds the max" do - bad_offset = Chouette::VehicleJourneyAtStop::DAY_OFFSET_MAX + 1 + bad_offset = Chouette::VehicleJourneyAtStop.day_offset_max + 1 at_stop = build_stubbed( :vehicle_journey_at_stop, |
