Merge branch 'rails4' of github.com:afimb/chouette2 into rails4

7 files changed, 29 insertions, 22 deletions

diff --git a/spec/features/companies_spec.rb b/spec/features/companies_spec.rb
index bcf73b631..e5c7ae6e5 100644
--- a/spec/features/companies_spec.rb
+++ b/spec/features/companies_spec.rb
@@ -9,7 +9,6 @@ describe "Companies", :type => :feature do
 
   describe "list" do
     it "display companies" do
-      puts referential.inspect
       visit referential_companies_path(referential)
       expect(page).to have_content(companies.first.name)
       expect(page).to have_content(companies.last.name)
@@ -42,7 +41,7 @@ describe "Companies", :type => :feature do
     it "edit company" do
       visit referential_company_path(referential, subject)
       click_link "Modifier ce transporteur"
-      fill_in "Nom", :with => "Company Modified"
+      fill_in "company_name", :with => "Company Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier transporteur")
       expect(page).to have_content("Company Modified")
diff --git a/spec/features/connection_links_spec.rb b/spec/features/connection_links_spec.rb
index 985aba7a6..d77189d41 100644
--- a/spec/features/connection_links_spec.rb
+++ b/spec/features/connection_links_spec.rb
@@ -27,7 +27,7 @@ describe "ConnectionLinks", :type => :feature do
       allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_connection_links_path(referential)
       click_link "#{connection_links.first.name}"
-      expect(page).to have_selector("#map", :class => 'connection_link')
+      expect(page).to have_selector("#map.connection_link")
     end
     
   end
diff --git a/spec/features/networks_spec.rb b/spec/features/networks_spec.rb
index 3bfb63ffd..ec65209eb 100644
--- a/spec/features/networks_spec.rb
+++ b/spec/features/networks_spec.rb
@@ -28,7 +28,7 @@ describe "Networks", :type => :feature do
       allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_networks_path(referential)
       click_link "#{networks.first.name}"
-      expect(page).to have_selector("#map", :class => 'network')
+      expect(page).to have_selector("#map.network")
     end
     
   end
@@ -38,7 +38,7 @@ describe "Networks", :type => :feature do
       allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_networks_path(referential)
       click_link "Ajouter un réseau"
-      fill_in "Nom", :with => "Network 1"
+      fill_in "network_name", :with => "Network 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:GroupOfLine:1"        
       click_button("Créer réseau")
@@ -51,7 +51,7 @@ describe "Networks", :type => :feature do
       allow(subject).to receive(:stop_areas).and_return(Array.new(2) { Factory(:stop_area) })
       visit referential_network_path(referential, subject)
       click_link "Modifier ce réseau"
-      fill_in "Nom", :with => "Network Modified"
+      fill_in "network_name", :with => "Network Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       click_button("Modifier réseau")
       expect(page).to have_content("Network Modified")
diff --git a/spec/features/vehicle_journey_imports_spec.rb b/spec/features/vehicle_journey_imports_spec.rb
index 3df9f1054..9ba38398c 100644
--- a/spec/features/vehicle_journey_imports_spec.rb
+++ b/spec/features/vehicle_journey_imports_spec.rb
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
+require 'csv'
 
 describe "VehicleJourneyImports", :type => :feature do
   login_user
diff --git a/spec/views/referentials/new.html.erb_spec.rb b/spec/views/referentials/new.html.erb_spec.rb
index dfc8fe6d5..82c8161ca 100644
--- a/spec/views/referentials/new.html.erb_spec.rb
+++ b/spec/views/referentials/new.html.erb_spec.rb
@@ -2,16 +2,18 @@ require 'spec_helper'
 
 describe "referentials/new.html.erb", :type => :view do
 
-  assign_referential
+  before(:each) do
+    assign(:referential, Referential.new)
+  end
   
   it "should have a textfield for name" do
     render
-    expect(rendered).to have_selector("input", :name => "referential[name]")
+    expect(rendered).to have_field("referential[name]")
   end
 
   it "should have a textfield for slug" do
     render
-    expect(rendered).to have_selector("input", :name => "referential[slug]")
+    expect(rendered).to have_field("referential[slug]")
   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 5306e9977..ab1d946bf 100644
--- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb
@@ -9,9 +9,9 @@ describe "/vehicle_journeys/_form", :type => :view do
 
   it "should render an input for transport_mode" do
     render
-    expect(rendered).to have_selector( "select", :name => "vehicle_journey[transport_mode]") do |node|
+    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", :value => mode.text_code)
+        expect(node).to have_selector("option", :text => mode.text_code)
       end
     end
   end
diff --git a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
index 4b9e50f14..037658851 100644
--- a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb
@@ -13,34 +13,38 @@ describe "/vehicle_journeys/_vehicle_journey_at_stop_fields", :type => :view do
     render( :partial => "vehicle_journeys/vehicle_journey_at_stop_fields", :collection => vehicle_journey.vehicle_journey_at_stops, :as => :vehicle_journey_at_stop, :locals => { :vehicle_journey_at_stops_size => 1 } )
   end
   
-  def field_name
-    "vehicle_journey[vehicle_journey_at_stops_attributes][0]"
-  end
-  
   it "should render vehicle_journey_at_stop's departure time" do
     render_collection
-    expect(rendered).to have_selector("td select", :name => "#{field_name}[departure_time(5i)]")
+    expect(rendered).to have_selector("td select[name='vehicle_journey[vehicle_journey_at_stops_attributes[0][departure_time(5i)]]']")
   end
 
   it "should render vehicle_journey_at_stop's stop_point_id" do
     render_collection
-    expect(rendered).to have_selector("td input", :name => "#{field_name}[stop_point_id]",
-                                 :value => vehicle_journey_at_stop.stop_point_id)
+    expect(rendered).to have_field("vehicle_journey[number]")
+    expect(rendered).to have_field("vehicle_journey[vehicle_journey_at_stops_attributes][0][stop_point_id]",
+                                      :with => vehicle_journey_at_stop.stop_point_id,
+                                      :type => "hidden")
   end
+  
   it "should render vehicle_journey_at_stop's id" do
     render_collection
-    expect(rendered).to have_selector("td input", :name => "#{field_name}[id]",
-                                 :value => vehicle_journey_at_stop.id)
+    expect(rendered).to have_field("vehicle_journey[vehicle_journey_at_stops_attributes][0][id]",
+                                   :with => vehicle_journey_at_stop.id,
+                                   :type => "hidden")
   end
+  
   it "should render vehicle_journey_at_stop's _destroy" do
     render_collection
-    expect(rendered).to have_selector("td input", :name => "#{field_name}[_destroy]",
-                                 :value => (vehicle_journey_at_stop._destroy ? "1" : "0"))
+    expect(rendered).to have_field("vehicle_journey[vehicle_journey_at_stops_attributes][0][_destroy]",
+                                   :with => (vehicle_journey_at_stop._destroy ? "1" : "0"),
+                                   :type => "hidden" )
   end
+  
   it "should render vehicle_journey_at_stop's stop name" do
     render_collection
     expect(rendered).to have_selector("td label", :text => vehicle_journey_at_stop.stop_point.stop_area.name )
   end
+  
   context "for a destroyed vehicle_journey_at_stop" do
     before(:each) do
       allow(vehicle_journey_at_stop).to receive_messages(:_destroy => true)
@@ -51,6 +55,7 @@ describe "/vehicle_journeys/_vehicle_journey_at_stop_fields", :type => :view do
       expect(rendered).to have_selector("tr.no_stop")
     end
   end
+  
   context "for a not destroyed vehicle_journey_at_stop" do
     before(:each) do
       allow(vehicle_journey_at_stop).to receive_messages(:_destroy => false)