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

21 files changed, 63 insertions, 31 deletions

diff --git a/app/assets/stylesheets/vendor/openlayers_style.css b/app/assets/stylesheets/vendor/openlayers_style.css
index 0e3a67108..25308996f 100644
--- a/app/assets/stylesheets/vendor/openlayers_style.css
+++ b/app/assets/stylesheets/vendor/openlayers_style.css
@@ -139,7 +139,7 @@ div.olControlMousePosition {
 }    
 
 .olControlNavigationHistory {
-   background-image: url( image-path('/assets/openlayers/navigation_history.png') );
+   background-image: url( image-path('openlayers/navigation_history.png') );
    background-repeat: no-repeat;
    width:  24px;
    height: 24px;
diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index b22dd75a8..2a9189eaa 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -79,4 +79,8 @@ class AccessLinksController < ChouetteController
       end
   end
 
+  def permitted_params
+    params.permit(company: [ :id, :access_link_type,:access_point_id, :stop_area_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation, :link_orientation_type, :stop_area ])
+  end
+
 end
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index 025c0fdee..90d0c2530 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -35,4 +35,8 @@ class CompaniesController < ChouetteController
     referential_companies_path(referential)
   end
 
+  def permitted_params
+    params.permit(company: [ :objectid, :object_version, :creation_time, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone ])
+  end
+
 end
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index 9f08babf0..a8e0c19a6 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -52,4 +52,8 @@ class ConnectionLinksController < ChouetteController
     referential_connection_links_path(referential)
   end
 
+  def permitted_params
+    params.permit(connection_link: [ :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs ])
+  end
+
 end
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 18e7ee28b..907d1e63d 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -50,4 +50,8 @@ class JourneyPatternsController < ChouetteController
     @journey_patterns ||= @q.result(:distinct => true).order(:name)
   end
 
+  def permitted_params
+    params.permit(journey_pattern: [ :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points ])
+  end
+
 end
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 25c4caaac..618bb83e6 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -40,4 +40,9 @@ class NetworksController < ChouetteController
   def collection_url
     referential_networks_path(referential)
   end
+
+  def permitted_params
+    params.permit(network: [ :objectid, :object_version, :creation_time, :creator_id, :version_date, :description, :name, :registration_number, :source_name, :source_type, :source_identifier, :comment ])
+  end
+  
 end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index be1738060..be0a3c4bd 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -87,4 +87,9 @@ class TimeTablesController < ChouetteController
   def collection_url
     referential_time_tables_path(referential)
   end
+
+  def permitted_params
+    params.permit(time_table: [ :objectid, :object_version, :creation_time, :creator_id, :version, :comment,
+:int_day_types, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :start_date, :end_date, :dates_attributes, :periods_attributes, :tag_list, :tag_search ] )
+  end
 end
diff --git a/app/inputs/extended_time_picker_input.rb b/app/inputs/extended_time_picker_input.rb
index 2298c0185..71628f128 100644
--- a/app/inputs/extended_time_picker_input.rb
+++ b/app/inputs/extended_time_picker_input.rb
@@ -3,7 +3,6 @@ class ExtendedTimePickerInput < Formtastic::Inputs::TimePickerInput
   def value
     return options[:input_html][:value] if options[:input_html] && options[:input_html].key?(:value)
     val = object.send(method)
-    puts val.to_s
     return "00:00:00" if val.is_a?(Date)
     return val.strftime("%H:%M:%S") if val.is_a?(Time)
     return "00:00:00" if val.nil?
diff --git a/app/views/companies/_companies.erb b/app/views/companies/_companies.erb
index f059201e6..bfb7a0b5b 100644
--- a/app/views/companies/_companies.erb
+++ b/app/views/companies/_companies.erb
@@ -1,9 +1,9 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info(@companies) %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info( @companies.to_a ) %>
 </div>
 <div class="companies paginated_content">
    <%= paginated_content(@companies) %>
 </div>
 <div class="pagination">
   <%= will_paginate @companies, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/companies/index.html.erb b/app/views/companies/index.html.erb
index c28eaa8bc..ec6ffbeb2 100644
--- a/app/views/companies/index.html.erb
+++ b/app/views/companies/index.html.erb
@@ -16,7 +16,7 @@
 </div>  
 <% end %>
 
-<div id="companies"><%= render 'companies' %></div>
+<div id="companies"><%= render partial: "companies", object: @companies %></div>
 
 <% content_for :sidebar do %>
 <ul class="actions">
diff --git a/app/views/connection_links/_connection_links.erb b/app/views/connection_links/_connection_links.erb
index cfc1d45f4..3717ecb9c 100644
--- a/app/views/connection_links/_connection_links.erb
+++ b/app/views/connection_links/_connection_links.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @connection_links.to_a %>
 </div>
 <div class="connection_links paginated_content">
   <%= paginated_content(@connection_links) %>
diff --git a/app/views/networks/_networks.erb b/app/views/networks/_networks.erb
index 9d95d63b6..65ea7d069 100644
--- a/app/views/networks/_networks.erb
+++ b/app/views/networks/_networks.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @networks %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @networks.to_a %>
 </div>
 <div class="networks paginated_content">
   <%= paginated_content(@networks) %>
diff --git a/app/views/time_tables/_time_tables.html.erb b/app/views/time_tables/_time_tables.html.erb
index 4458f653d..ba95c1811 100644
--- a/app/views/time_tables/_time_tables.html.erb
+++ b/app/views/time_tables/_time_tables.html.erb
@@ -1,5 +1,5 @@
 <div class="page_info">
-  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @time_tables %>
+  <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @time_tables.to_a %>
 </div>
 <div class="time_tables paginated_content">
   <%= paginated_content(@time_tables) %>
diff --git a/db/migrate/20120823053740_create_organisation.rb b/db/migrate/20120823053740_create_organisation.rb
index c3a0633a5..202dba082 100644
--- a/db/migrate/20120823053740_create_organisation.rb
+++ b/db/migrate/20120823053740_create_organisation.rb
@@ -13,7 +13,7 @@ class CreateOrganisation < ActiveRecord::Migration
     Referential.reset_column_information
     User.reset_column_information
 
-    organisation = Organisation.find_or_create_by_name!("Chouette")
+    organisation = Organisation.first_or_create(:name => "Chouette")
     Referential.update_all :organisation_id => organisation.id
     User.update_all :organisation_id => organisation.id
   end
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)