diff options
| -rw-r--r-- | app/assets/stylesheets/modules/_jp_collection.sass | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/modules/_vj_collection.sass | 1 | ||||
| -rw-r--r-- | spec/models/chouette/route_spec.rb | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/modules/_jp_collection.sass b/app/assets/stylesheets/modules/_jp_collection.sass index 05485dcf9..345ac4d3d 100644 --- a/app/assets/stylesheets/modules/_jp_collection.sass +++ b/app/assets/stylesheets/modules/_jp_collection.sass @@ -8,6 +8,7 @@ > .td position: relative padding-left: 25px + height: 75px /* Default value */ > .headlined &:before diff --git a/app/assets/stylesheets/modules/_vj_collection.sass b/app/assets/stylesheets/modules/_vj_collection.sass index cd9ea687c..08280b33b 100644 --- a/app/assets/stylesheets/modules/_vj_collection.sass +++ b/app/assets/stylesheets/modules/_vj_collection.sass @@ -8,6 +8,7 @@ > .td position: relative padding-left: 25px + height: 75px /* Default value */ > .headlined &:before diff --git a/spec/models/chouette/route_spec.rb b/spec/models/chouette/route_spec.rb index e24e16b18..378e359e0 100644 --- a/spec/models/chouette/route_spec.rb +++ b/spec/models/chouette/route_spec.rb @@ -125,15 +125,15 @@ describe Chouette::Route, :type => :model do it "should ignore deleted stop_point from route" do subject.update_attributes( :stop_points_attributes => removed_stop_hash) - expect(Chouette::Route.find( subject.id ).stop_points.map(&:id)).to eq(new_stop_id_list) + expect(Chouette::Route.find( subject.id ).stop_points.map(&:id).sort).to eq(new_stop_id_list.sort) end it "should ignore deleted stop_point from route's journey pattern" do subject.update_attributes( :stop_points_attributes => removed_stop_hash) - expect(Chouette::JourneyPattern.find( journey_pattern.id ).stop_points.map(&:id)).to eq(new_stop_id_list) + expect(Chouette::JourneyPattern.find( journey_pattern.id ).stop_points.map(&:id).sort).to eq(new_stop_id_list.sort) end it "should ignore deleted stop_point from route's vehicle journey at stop" do subject.update_attributes( :stop_points_attributes => removed_stop_hash) - expect(Chouette::VehicleJourney.find( vehicle_journey.id ).vehicle_journey_at_stops.map(&:stop_point_id)).to match_array(new_stop_id_list) + expect(Chouette::VehicleJourney.find( vehicle_journey.id ).vehicle_journey_at_stops.map(&:stop_point_id).sort).to match_array(new_stop_id_list.sort) end end end |