Merge remote-tracking branch 'origin/master' into 3479-refactor-table_builder-helper

3 files changed, 16 insertions, 9 deletions

diff --git a/spec/controllers/route_stop_points_controller_spec.rb b/spec/controllers/route_stop_points_controller_spec.rb
index 2f5fa41c7..ac9e2f11b 100644
--- a/spec/controllers/route_stop_points_controller_spec.rb
+++ b/spec/controllers/route_stop_points_controller_spec.rb
@@ -15,9 +15,7 @@ RSpec.describe RouteStopPointsController, type: :controller do
     end
 
     it 'returns a JSON of stop areas' do
-      expect(response.body).to eq(route.stop_points.map { |sp| { id: sp.id, name: sp.name } }.to_json)
+      expect(response.body).to eq(route.stop_points.map { |sp| { id: sp.id, stop_area_id: sp.stop_area.id, name: sp.name, zip_code: sp.stop_area.zip_code, city_name: sp.stop_area.city_name } }.to_json)
     end
   end
 end
-
-
diff --git a/spec/models/chouette/time_table_spec.rb b/spec/models/chouette/time_table_spec.rb
index 1e5972c04..7a8863cb3 100644
--- a/spec/models/chouette/time_table_spec.rb
+++ b/spec/models/chouette/time_table_spec.rb
@@ -1,12 +1,21 @@
 require 'spec_helper'
 
 describe Chouette::TimeTable, :type => :model do
-
   subject { create(:time_table) }
 
   it { is_expected.to validate_presence_of :comment }
   it { is_expected.to validate_uniqueness_of :objectid }
 
+  context "merge with calendar" do
+    let(:calendar) { create(:calendar) }
+
+    it 'should add calendar dates to time_table' do
+      subject.dates.clear
+      subject.merge!(calendar.convert_to_time_table)
+      expect(subject.dates.map(&:date)).to include(*calendar.dates)
+    end
+  end
+
   describe "actualize" do
     let(:calendar) { create(:calendar) }
     let(:int_day_types) { 508 }
diff --git a/spec/models/clean_up_spec.rb b/spec/models/clean_up_spec.rb
index b4cf5e1af..4b1bf4da9 100644
--- a/spec/models/clean_up_spec.rb
+++ b/spec/models/clean_up_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe CleanUp, :type => :model do
     let(:cleaner) { create(:clean_up, date_type: :after, begin_date: time_table_date.date) }
 
     it 'should destroy record' do
-      count = Chouette::TimeTableDate.where('date >= ?', cleaner.begin_date).count
+      count = Chouette::TimeTableDate.where('date > ?', cleaner.begin_date).count
       expect{ cleaner.destroy_time_tables_dates_after }.to change {
         Chouette::TimeTableDate.count
       }.by(-count)
@@ -173,9 +173,9 @@ RSpec.describe CleanUp, :type => :model do
 
   context '#destroy_time_tables_after' do
     let!(:time_table) { create(:time_table ) }
-    let(:cleaner) { create(:clean_up, date_type: :after, begin_date: time_table.start_date) }
+    let(:cleaner) { create(:clean_up, date_type: :after, begin_date: time_table.start_date - 1.day) }
 
-    it 'should destroy time_tables with start_date >= purge begin_date' do
+    it 'should destroy time_tables with start_date > purge begin_date' do
       expect{ cleaner.destroy_time_tables_after }.to change {
         Chouette::TimeTable.count
       }.by(-1)
@@ -209,9 +209,9 @@ RSpec.describe CleanUp, :type => :model do
 
   context '#destroy_time_tables_before' do
     let!(:time_table) { create(:time_table ) }
-    let(:cleaner) { create(:clean_up, date_type: :before, begin_date: time_table.end_date) }
+    let(:cleaner) { create(:clean_up, date_type: :before, begin_date: time_table.end_date + 1.day) }
 
-    it 'should destroy time_tables with end_date <= purge begin_date' do
+    it 'should destroy time_tables with end_date < purge begin_date' do
       expect{ cleaner.destroy_time_tables_before }.to change {
         Chouette::TimeTable.count
       }.by(-1)