Fix time_table should keep int_day_types on #actualize

Refs #3445

2 files changed, 30 insertions, 1 deletions

diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 42879c6d5..85f1e8c6e 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -138,7 +138,10 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def actualize
     self.dates.clear
     self.periods.clear
-    self.merge! self.calendar.convert_to_time_table
+    from = self.calendar.convert_to_time_table
+    self.dates   = from.dates
+    self.periods = from.periods
+    self.save
   end
 
   def month_inspect(date)
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index 3d45bd346..de3e8e07d 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -7,6 +7,32 @@ describe Chouette::TimeTable, :type => :model do
   it { is_expected.to validate_presence_of :comment }
   it { is_expected.to validate_uniqueness_of :objectid }
 
+  describe "actualize" do
+    let(:calendar) { create(:calendar) }
+    let(:int_day_types) { 508 }
+
+    before do
+      subject.int_day_types = int_day_types
+      subject.calendar = calendar
+      subject.save
+      subject.actualize
+    end
+
+    it 'should override dates' do
+      expect(subject.dates.map(&:date)).to match_array calendar.dates
+    end
+
+    it 'should override periods' do
+      [:period_start, :period_end].each do |key|
+        expect(subject.periods.map(&key)).to match_array calendar.convert_to_time_table.periods.map(&key)
+      end
+    end
+
+    it 'should not change int_day_types' do
+      expect(subject.int_day_types).to eq(int_day_types)
+    end
+  end
+
   describe "Update state" do
     def time_table_to_state time_table
       time_table.slice('id', 'comment').tap do |item|