fix VehicleTranslation model for Rails4 requirements

2 files changed, 3 insertions, 2 deletions

diff --git a/app/models/vehicle_translation.rb b/app/models/vehicle_translation.rb
index f89c127ab..76d679c30 100644
--- a/app/models/vehicle_translation.rb
+++ b/app/models/vehicle_translation.rb
@@ -5,7 +5,6 @@ class VehicleTranslation
 
   attr_accessor :vehicle_journey_id, :count, :duration
   attr_accessor :first_stop_time, :departure_or_arrival
-  attr_accessor :delta
 
   validates_presence_of :count, :duration, :first_stop_time, :departure_or_arrival
   validates_inclusion_of :departure_or_arrival, :in =>  %w( departure arrival)
@@ -75,6 +74,7 @@ class VehicleTranslation
 
         vehicle_journey.vehicle_journey_at_stops.each do |vjas|
           vjas_attributes = vjas.attributes.merge( "vehicle_journey_id" => translated.id)
+          vjas_attributes.delete( "id" )
           vjas_attributes.merge! "departure_time" => ( vjas_attributes[ "departure_time"] + delta),
                                  "arrival_time" => ( vjas_attributes[ "arrival_time"] + delta)
 
diff --git a/spec/models/vehicle_translation_spec.rb b/spec/models/vehicle_translation_spec.rb
index 6b6783c1e..a2f3e486b 100644
--- a/spec/models/vehicle_translation_spec.rb
+++ b/spec/models/vehicle_translation_spec.rb
@@ -48,7 +48,7 @@ describe VehicleTranslation, :type => :model do
       expect(count_after).to eq(count_before + subject.count.to_i)
     end
     def last_created_vehicle
-      Chouette::VehicleJourney.find( :all, :order => :creation_time).last
+      Chouette::VehicleJourney.order( creation_time: :asc).last
     end
     it "should add vehicle having same published_journey_name" do
       subject.translate
@@ -78,6 +78,7 @@ describe VehicleTranslation, :type => :model do
       read_vehicle = Chouette::VehicleJourney.find(vehicle_journey.id)  # read from bd, change time values
       delta = subject.first_delta
       subject.translate
+
       last_created_vehicle.vehicle_journey_at_stops.each_with_index do |vjas, index|
         expect(vjas.departure_time).to eq(read_vehicle.vehicle_journey_at_stops[index].departure_time + delta + subject.duration.minutes)
         expect(vjas.arrival_time).to eq(read_vehicle.vehicle_journey_at_stops[index].arrival_time + delta + subject.duration.minutes)