Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-06 17:28:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1903 from lrbalt/fix-test-errors

Browse source 
Fix failing tests for non-UTC timezones
This commit is contained in:
Matt Rogers 2015-08-07 19:50:58 -04:00
commit 1c0a70df75
27 changed files with 205 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/todos_controller.rb
View file

@ -1085,10 +1085,10 @@ end
if recurring_todo.todos.active.count == 0
# check for next todo either from the due date or the show_from date
date_to_check = todo.due.nil? ? todo.show_from : todo.due
date_to_check = todo.due || todo.show_from
# if both due and show_from are nil, check for a next todo from now
date_to_check = Time.zone.now if date_to_check.nil?
date_to_check ||= Time.zone.now
if recurring_todo.active? && recurring_todo.continues_recurring?(date_to_check)
@ -1101,7 +1101,7 @@ end
# for tomorrow.
date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now-1.day
new_recurring_todo = TodoFromRecurringTodo.new(current_user, recurring_todo).create(date.at_midnight)
new_recurring_todo = TodoFromRecurringTodo.new(current_user, recurring_todo).create(date)
end
end
end