Refs #1936 : transport modes

2 files changed, 14 insertions, 8 deletions

diff --git a/spec/models/line_referential_spec.rb b/spec/models/line_referential_spec.rb
index 02838a4a7..942795076 100644
--- a/spec/models/line_referential_spec.rb
+++ b/spec/models/line_referential_spec.rb
@@ -9,4 +9,10 @@ RSpec.describe LineReferential, :type => :model do
   it { is_expected.to have_many(:line_referential_syncs) }
   it { is_expected.to have_many(:workbenches) }
   it { should validate_presence_of(:sync_interval) }
+
+  describe "#transport_modes" do
+    it 'returns a list of all transport modes' do
+      expect(FactoryGirl.create(:line_referential).transport_modes).to eq( Chouette::TransportMode.all.select { |tm| tm.positive? } )
+    end
+  end
 end
diff --git a/spec/views/vehicle_journeys/_form.html.erb_spec.rb b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
index 05fa068d9..af32406b8 100644
--- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "/vehicle_journeys/_form", :type => :view do
-  
+
   assign_referential
   let!(:line) { assign :line, create(:line) }
   let!(:route) { assign :route, create(:route, :line => line) }
@@ -14,7 +14,7 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                               route,
                                                                                                               vehicle_journey) }
     expect(rendered).to have_selector( "select#vehicle_journey_transport_mode_name") do |node|
-      Chouette::Line.transport_modes.each do |mode|
+      line.transport_modes.each do |mode|
         expect(node).to have_selector("option", :text => mode.text_code)
       end
     end
@@ -26,7 +26,7 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                               line,
                                                                                                               route,
                                                                                                               vehicle_journey) }
-    expect(rendered).to have_selector("form") do 
+    expect(rendered).to have_selector("form") do
       with_selector "input[type=text][comment=]", vehicle_journey.comment
     end
   end
@@ -37,7 +37,7 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                                 line,
                                                                                                                 route,
                                                                                                                 vehicle_journey) }
-      expect(rendered).to have_selector("form") do |form_node| 
+      expect(rendered).to have_selector("form") do |form_node|
         vehicle_journey.stop_points.each do |sp|
           form_node.with_selector "label", :text => sp.stop_area.name
         end
@@ -51,14 +51,14 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                                 vehicle_journey) }
       expect(view).to render_template(:partial => "_vehicle_journey_at_stop_fields", :count => vehicle_journey.vehicle_journey_at_stops.count)
     end
-    
+
     it "should render vehicle_journey_at_stop's departure time" do
       render partial: 'vehicle_journeys/form',
              locals: { vehicle_journey: vehicle_journey, form_url: referential_line_route_vehicle_journeys_path(referential,
                                                                                                                 line,
                                                                                                                 route,
                                                                                                                 vehicle_journey) }
-      expect(rendered).to have_selector("form") do |form_node| 
+      expect(rendered).to have_selector("form") do |form_node|
         vehicle_journey.stop_points.each_with_index do |sp, index|
           form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(4i)]"
           form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(5i)]"
@@ -73,7 +73,7 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                                 line,
                                                                                                                 route,
                                                                                                                 vehicle_journey) }
-      expect(rendered).to have_selector("form") do 
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][objectid=][disabled=true]", vehicle_journey.objectid
       end
     end
@@ -86,7 +86,7 @@ describe "/vehicle_journeys/_form", :type => :view do
                                                                                                                 line,
                                                                                                                 route,
                                                                                                                 vehicle_journey) }
-      expect(rendered).to have_selector("form") do 
+      expect(rendered).to have_selector("form") do
         with_selector "input[type=text][objectid=][disabled=false]", vehicle_journey.objectid
       end
     end