diff options
| author | jpl | 2017-02-27 19:10:24 +0100 |
|---|---|---|
| committer | jpl | 2017-02-27 19:10:24 +0100 |
| commit | 600e47f093597580178e3e2fbb0cf766014e6d92 (patch) | |
| tree | f28bd58d2862a72b1bf975c56f16e2be0faafe0d | |
| parent | 331e69d3d7fc8635a6f8df2a2afb3061d9e213c8 (diff) | |
| download | chouette-core-600e47f093597580178e3e2fbb0cf766014e6d92.tar.bz2 | |
Refs #2648: fix tests, updating jp_coll
| -rw-r--r-- | app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js | 2 | ||||
| -rw-r--r-- | spec/models/chouette/route_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index 59a578672..554a0038b 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -21,7 +21,7 @@ const JourneyPattern = (props) => { <div className='th'> <div className='strong mb-xs'>{props.value.object_id}</div> <div>{props.value.registration_number}</div> - <div>{actions.getChecked(props.value.stop_points).length}</div> + <div>{actions.getChecked(props.value.stop_points).length} arrĂȘt(s)</div> <div className='clearfix' style={{display: 'inline-block', verticalAlign: 'top', width: '25px'}}> <button className={(props.value.deletable ? 'disabled' : '') + ' btn btn-xs btn-danger pull-right'} onClick={props.onOpenEditModal} data-toggle='modal' data-target='#JourneyPatternModal'> diff --git a/spec/models/chouette/route_spec.rb b/spec/models/chouette/route_spec.rb index 7bd89703c..11c455ab6 100644 --- a/spec/models/chouette/route_spec.rb +++ b/spec/models/chouette/route_spec.rb @@ -108,7 +108,7 @@ describe Chouette::Route, :type => :model do end it "should have swap stop_points from route's journey pattern" do subject.update_attributes( :stop_points_attributes => swapped_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 have swap stop_points from route's vehicle journey at stop" do subject.update_attributes( :stop_points_attributes => swapped_stop_hash) |
