aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2017-05-24 12:22:21 +0200
committerTeddy Wing2017-05-26 13:20:56 +0200
commite6da3ada61206ec0778fb1139bc61073cf404c7e (patch)
tree22088f790829896074d30c81fe5d4550a320cfb7
parent3564ad224a4f1e3a409e44a31950184e75920f2e (diff)
downloadchouette-core-e6da3ada61206ec0778fb1139bc61073cf404c7e.tar.bz2
IncreasingTimeOrderValidator: Rename `#increasing_times_validate` method
I didn't like the name of this method because it wasn't super clear what its intent was. Rename it to something that describes it better. Refs #870
-rw-r--r--app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb7
-rw-r--r--spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb8
2 files changed, 9 insertions, 6 deletions
diff --git a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
index 8e921b494..95f0cdc3e 100644
--- a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
@@ -8,7 +8,10 @@ module Chouette
.vehicle_journey_at_stops
.select { |vjas| vjas.departure_time && vjas.arrival_time }
.each do |vjas|
- unless self.class.increasing_times_validate(vjas, previous_at_stop)
+ unless self.class.validate_at_stop_times_must_increase(
+ vjas,
+ previous_at_stop
+ )
vehicle_journey.errors.add(
:vehicle_journey_at_stops,
'time gap overflow'
@@ -19,7 +22,7 @@ module Chouette
end
end
- def self.increasing_times_validate(at_stop, previous_at_stop)
+ def self.validate_at_stop_times_must_increase(at_stop, previous_at_stop)
valid = true
return valid unless previous_at_stop
diff --git a/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb b/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
index f8d5b9ae4..976218d4f 100644
--- a/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
+++ b/spec/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator_spec.rb
@@ -23,7 +23,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
end
end
- describe ".increasing_times_validate" do
+ describe ".validate_at_stop_times_must_increase" do
let!(:vehicle_journey) { create(:vehicle_journey_odd) }
subject { vehicle_journey.vehicle_journey_at_stops.first }
@@ -35,7 +35,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
vjas1.arrival_time = vjas2.arrival_time - 5.hour
expect(
Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
- .increasing_times_validate(vjas2, vjas1)
+ .validate_at_stop_times_must_increase(vjas2, vjas1)
).to be_falsey
expect(vjas2.errors).not_to be_empty
expect(vjas2.errors[:arrival_time]).not_to be_blank
@@ -47,7 +47,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
vjas1.departure_time = vjas2.departure_time - 5.hour
expect(
Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
- .increasing_times_validate(vjas2, vjas1)
+ .validate_at_stop_times_must_increase(vjas2, vjas1)
).to be_falsey
expect(vjas2.errors).not_to be_empty
expect(vjas2.errors[:departure_time]).not_to be_blank
@@ -58,7 +58,7 @@ describe Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator do
it "should not add errors" do
expect(
Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator
- .increasing_times_validate(vjas2, vjas1)
+ .validate_at_stop_times_must_increase(vjas2, vjas1)
).to be_truthy
expect(vjas2.errors).to be_empty
end