diff options
| -rw-r--r-- | app/models/clean_up.rb | 12 | ||||
| -rw-r--r-- | spec/models/clean_up_spec.rb | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb index a2b150ecc..978cc7ecb 100644 --- a/app/models/clean_up.rb +++ b/app/models/clean_up.rb @@ -31,21 +31,21 @@ class CleanUp < ActiveRecord::Base end def destroy_time_tables_before - time_tables = Chouette::TimeTable.where('end_date <= ?', self.begin_date) + time_tables = Chouette::TimeTable.where('end_date < ?', self.begin_date) self.destroy_time_tables(time_tables) end def destroy_time_tables_after - time_tables = Chouette::TimeTable.where('start_date >= ?', self.begin_date) + time_tables = Chouette::TimeTable.where('start_date > ?', self.begin_date) self.destroy_time_tables(time_tables) end def destroy_time_table_dates_before - Chouette::TimeTableDate.in_dates.where('date <= ?', self.begin_date).destroy_all + Chouette::TimeTableDate.in_dates.where('date < ?', self.begin_date).destroy_all end def destroy_time_tables_dates_after - Chouette::TimeTableDate.in_dates.where('date >= ?', self.begin_date).destroy_all + Chouette::TimeTableDate.in_dates.where('date > ?', self.begin_date).destroy_all end def destroy_time_tables_dates_between @@ -53,11 +53,11 @@ class CleanUp < ActiveRecord::Base end def destroy_time_tables_periods_before - Chouette::TimeTablePeriod.where('period_end <= ?', self.begin_date).destroy_all + Chouette::TimeTablePeriod.where('period_end < ?', self.begin_date).destroy_all end def destroy_time_tables_periods_after - Chouette::TimeTablePeriod.where('period_start >= ?', self.begin_date).destroy_all + Chouette::TimeTablePeriod.where('period_start > ?', self.begin_date).destroy_all end def destroy_time_tables_periods_between 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) |