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

4 files changed, 6 insertions, 6 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