Update IHM for vehicle journey frequency

3 files changed, 43 insertions, 9 deletions

diff --git a/spec/models/gtfs_export_spec.rb b/spec/models/gtfs_export_spec.rb
index 6051497a7..ccc98e872 100644
--- a/spec/models/gtfs_export_spec.rb
+++ b/spec/models/gtfs_export_spec.rb
@@ -11,7 +11,7 @@ describe GtfsExport, :type => :model do
       end
 
       it "should be mandatory" do
-        subject.should validate_presence_of(:time_zone)
+        should validate_presence_of(:time_zone)
       end
 
     end
@@ -23,7 +23,7 @@ describe GtfsExport, :type => :model do
       end
 
       it "should be mandatory" do
-        subject.should_not validate_presence_of(:time_zone)
+        should_not validate_presence_of(:time_zone)
       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 ab1d946bf..05fa068d9 100644
--- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
@@ -8,7 +8,11 @@ describe "/vehicle_journeys/_form", :type => :view do
   let!(:vehicle_journey) { assign :vehicle_journey, create(:vehicle_journey, :route => route) }
 
   it "should render an input for transport_mode" do
-    render
+    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( "select#vehicle_journey_transport_mode_name") do |node|
       Chouette::Line.transport_modes.each do |mode|
         expect(node).to have_selector("option", :text => mode.text_code)
@@ -17,14 +21,22 @@ describe "/vehicle_journeys/_form", :type => :view do
   end
 
   it "should render an input for comment" do
-    render
+    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 
       with_selector "input[type=text][comment=]", vehicle_journey.comment
     end
   end
   context "stop's time view part" do
     it "should render stop's names" do
-      render
+      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| 
         vehicle_journey.stop_points.each do |sp|
           form_node.with_selector "label", :text => sp.stop_area.name
@@ -32,12 +44,20 @@ describe "/vehicle_journeys/_form", :type => :view do
       end
     end
     it "renders _vehicle_journey_at_stop_fields partial for each vehicle_journey_at_stop" do
-      render
+      render partial: 'vehicle_journeys/form',
+             locals: { vehicle_journey: vehicle_journey, form_url: referential_line_route_vehicle_journeys_path(referential,
+                                                                                                                line,
+                                                                                                                route,
+                                                                                                                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
+      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| 
         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)]"
@@ -48,7 +68,11 @@ describe "/vehicle_journeys/_form", :type => :view do
   end
   context "when existing vehicle_journey" do
     it "should display objectid not as an input" do
-      render
+      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 
         with_selector "input[type=text][objectid=][disabled=true]", vehicle_journey.objectid
       end
@@ -57,7 +81,11 @@ describe "/vehicle_journeys/_form", :type => :view do
   context "when new vehicle_journey" do
     let!(:vehicle_journey) { assign :vehicle_journey, build(:vehicle_journey, :route => route) }
     it "should render an input for objectid" do
-      render
+      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 
         with_selector "input[type=text][objectid=][disabled=false]", vehicle_journey.objectid
       end
diff --git a/spec/views/vehicle_journeys/_vehicle_journey.html.erb_spec.rb b/spec/views/vehicle_journeys/_vehicle_journey.html.erb_spec.rb
new file mode 100644
index 000000000..e1c61c4a7
--- /dev/null
+++ b/spec/views/vehicle_journeys/_vehicle_journey.html.erb_spec.rb
@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe "/vehicle_journeys/_vehicle_journey", :type => :view do
+
+  assign_referential
+end