mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-20 09:10:12 +01:00
Revert breaking commits
This reverts the following commits:319d4b00cd403cc1015e37485013a0d08ffb3806
This commit is contained in:
Dan Rice
parent
55e28d90a9
commit
1dbef179a7
8 changed files with 81 additions and 301 deletions
|
|
@ -1051,7 +1051,7 @@ 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.localtime : todo.due.localtime
|
||||
date_to_check = todo.due.nil? ? todo.show_from : todo.due
|
||||
|
||||
# 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?
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ module RecurringTodos
|
|||
# TODO: recheck if future rails versions have this problem too
|
||||
start = Time.utc(start.year, start.month, start.day)+n.months
|
||||
end
|
||||
Time.zone.local(start.year, start.month, every_x_day).localtime.at_midnight
|
||||
Time.zone.local(start.year, start.month, every_x_day)
|
||||
end
|
||||
|
||||
def find_relative_day_of_month(start, n)
|
||||
|
|
|
|||
|
|
@ -379,9 +379,9 @@ class RecurringTodosControllerTest < ActionController::TestCase
|
|||
"tag_list"=>"one, two, three, four", format: :js
|
||||
|
||||
assert_equal "new recurrence pattern", assigns['recurring_todo'].description
|
||||
assert_equal "2013-01-02", assigns['recurring_todo'].start_from.localtime.to_date.to_s
|
||||
assert_equal "2013-01-02 00:00:00 +0000", assigns['recurring_todo'].start_from.to_s
|
||||
todo = assigns['recurring_todo'].todos.first
|
||||
assert_equal "2013-01-02", todo.show_from.localtime.to_date.to_s
|
||||
assert_equal "2013-01-02 00:00:00 +0000", todo.show_from.to_s
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class StatsControllerTest < ActionController::TestCase
|
|||
totals = assigns['stats'].totals
|
||||
assert_equal 4, totals.tags
|
||||
assert_equal 2, totals.unique_tags
|
||||
assert_equal 2.weeks.ago.localtime.at_midnight, totals.first_action_at.localtime.at_midnight
|
||||
assert_equal 2.week.ago.utc.at_midnight, totals.first_action_at.utc.at_midnight
|
||||
end
|
||||
|
||||
def test_downdrill
|
||||
|
|
|
|||
|
|
@ -740,14 +740,14 @@ class TodosControllerTest < ActionController::TestCase
|
|||
|
||||
# locate the new todo in tickler
|
||||
new_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'deferred').first
|
||||
refute new_todo.nil?, "the todo should be in the tickler"
|
||||
assert !new_todo.nil?, "the todo should be in the tickler"
|
||||
|
||||
assert_equal "Call Bill Gates every day", new_todo.description
|
||||
assert_not_equal todo_1.id, new_todo.id, "check that the new todo is not the same as todo_1"
|
||||
refute new_todo.show_from.nil?, "check that the new_todo is in the tickler to show next month"
|
||||
assert !new_todo.show_from.nil?, "check that the new_todo is in the tickler to show next month"
|
||||
|
||||
# do not use today here. It somehow gets messed up with the timezone calculation.
|
||||
next_month = (today + 1.month).localtime.at_midnight
|
||||
next_month = (Time.zone.now + 1.month).at_midnight
|
||||
|
||||
assert_equal next_month.utc.to_date.to_s(:db), new_todo.show_from.utc.to_date.to_s(:db)
|
||||
end
|
||||
|
|
|
|||
220
test/fixtures/tracks_last_mail.log.old
vendored
220
test/fixtures/tracks_last_mail.log.old
vendored
|
|
@ -1,220 +0,0 @@
|
|||
Received: from mail-qc0-f175.google.com (mail-qc0-f175.google.com [209.85.216.175])
|
||||
by gandalf.balt.nu (8.14.8/8.14.8) with ESMTP id s8O9DEa3032594
|
||||
for <task@balt-nu.xs4all.nl>; Wed, 24 Sep 2014 11:13:14 +0200
|
||||
Received: by mail-qc0-f175.google.com with SMTP id o8so3072914qcw.34
|
||||
for <task@balt-nu.xs4all.nl>; Wed, 24 Sep 2014 02:13:13 -0700 (PDT)
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20130820;
|
||||
h=x-gm-message-state:delivered-to:dkim-signature:from:to:references
|
||||
:in-reply-to:subject:date:message-id:mime-version:content-type
|
||||
:thread-index:content-language;
|
||||
bh=nWJv3oQMsXP4/5/l+eXcFEElvo9gGf/EHfJDdpLbUTc=;
|
||||
b=j2DqxKCqpeb0eAhyrY6LKpDbLMfDzg+szNUJcQ+7eV2BCCv9b4HidkbrPtUbfHLzfm
|
||||
kKwvWpSARQhL68IJAcWJLR/8s0VljETtLYhHW9rKaZIiY61nTDwhomzBZ30UqWpTRwne
|
||||
p9aY3z11NCjP1rwIHzcoSIpdPVt54Pt0dkA6EZxVJopXguB6Dggw0+F64f9wcCkrlJHF
|
||||
KWb/O3oOt3zEicW6TcMPUMFCvkXTLIkL58WC4enqSM0XqgXUMrSkHaxg3WNkOLa3c/L2
|
||||
y+j4VZysWxVc3FJ6KRf3Lwiy0xU8nMOX+g24wRBEz25X8GnQUChPgaU7IfDxqBSOIoJe
|
||||
g+gw==
|
||||
X-Gm-Message-State: ALoCoQl3V8lMkmm4Gts/aZ0Lu/5qryAOT350PDDAtbaQlpcj+zlPTZqCfsUP0zhbJUJ4JOScq02E
|
||||
X-Received: by 10.140.47.137 with SMTP id m9mr7253559qga.95.1411549993693;
|
||||
Wed, 24 Sep 2014 02:13:13 -0700 (PDT)
|
||||
X-Forwarded-To: task@balt-nu.xs4all.nl
|
||||
X-Forwarded-For: task@balt.nu task@balt-nu.xs4all.nl
|
||||
Delivered-To: task@balt.nu
|
||||
Received: by 10.140.19.48 with SMTP id 45csp501727qgg;
|
||||
Wed, 24 Sep 2014 02:13:12 -0700 (PDT)
|
||||
X-Received: by 10.180.20.43 with SMTP id k11mr30173626wie.38.1411549992151;
|
||||
Wed, 24 Sep 2014 02:13:12 -0700 (PDT)
|
||||
Received: from mail-wi0-x235.google.com (mail-wi0-x235.google.com [2a00:1450:400c:c05::235])
|
||||
by mx.google.com with ESMTPS id dc10si12067203wjb.104.2014.09.24.02.13.11
|
||||
for <task@balt.nu>
|
||||
(version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
|
||||
Wed, 24 Sep 2014 02:13:12 -0700 (PDT)
|
||||
Received-SPF: pass (google.com: domain of lrbalt@gmail.com designates 2a00:1450:400c:c05::235 as permitted sender) client-ip=2a00:1450:400c:c05::235;
|
||||
Authentication-Results: mx.google.com;
|
||||
spf=pass (google.com: domain of lrbalt@gmail.com designates 2a00:1450:400c:c05::235 as permitted sender) smtp.mail=lrbalt@gmail.com;
|
||||
dkim=pass header.i=@gmail.com;
|
||||
dmarc=pass (p=NONE dis=NONE) header.from=gmail.com
|
||||
Received: by mail-wi0-f181.google.com with SMTP id z2so6789450wiv.8
|
||||
for <task@balt.nu>; Wed, 24 Sep 2014 02:13:11 -0700 (PDT)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=gmail.com; s=20120113;
|
||||
h=from:to:references:in-reply-to:subject:date:message-id:mime-version
|
||||
:content-type:thread-index:content-language;
|
||||
bh=nWJv3oQMsXP4/5/l+eXcFEElvo9gGf/EHfJDdpLbUTc=;
|
||||
b=FrUi4Bfq76YukPqYAxgemZKpC/b+t3JkmojuKzlxky5w0OJcwfYx19XY5EGgxTpDWG
|
||||
djgXZIt3B3Py9zw1ieSQmn67mntzsI8UudNMnkAZur4vHIFovUDQtIzr1PmRFqrSZr/E
|
||||
BB4rpPZ8lhhO/MCxNj0q9ZWaphtMnCIik+GfR1JTIqmoTxdR/7O4B/S67yXuT6IXiBez
|
||||
pL+Abe59jlwR6nahx13do9HjLGpyrKoojPQbTAaQpyxYdA+wy48L7txWJBS5KB6A9X/5
|
||||
K4a+Slc6OJ+Z19g0NfjmUg2C9pUepLA/JcGImJJ7GAoiKkKeIOz5ba7vGOrY7eq+6Juo
|
||||
VprA==
|
||||
X-Received: by 10.194.201.201 with SMTP id kc9mr6601023wjc.50.1411549991779;
|
||||
Wed, 24 Sep 2014 02:13:11 -0700 (PDT)
|
||||
Received: from BaltAdviesASUS (balt-oud.xs4all.nl. [83.160.43.157])
|
||||
by mx.google.com with ESMTPSA id u8sm5044998wia.24.2014.09.24.02.13.10
|
||||
for <task@balt.nu>
|
||||
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
|
||||
Wed, 24 Sep 2014 02:13:10 -0700 (PDT)
|
||||
From: 5555555555@tmomail.net
|
||||
To: 5555555555@tmomail.net
|
||||
References: <fd565d3d-e03b-4382-95f3-843755956335@MAS2103.INFRA.LOCAL>
|
||||
In-Reply-To: <fd565d3d-e03b-4382-95f3-843755956335@MAS2103.INFRA.LOCAL>
|
||||
Subject: FW: Ingediende nota('s)
|
||||
Date: Wed, 24 Sep 2014 11:13:10 +0200
|
||||
Message-ID: <001d01cfd7d7$c383a9c0$4a8afd40$@gmail.com>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/mixed;
|
||||
boundary="----=_NextPart_000_0022_01CFD7E8.870D8B30"
|
||||
X-Mailer: Microsoft Outlook 15.0
|
||||
Thread-Index: AQHegIh7i1l3Ugf25nxZMiNc2taHEJvyrmxQ
|
||||
Content-Language: nl
|
||||
|
||||
This is a multipart message in MIME format.
|
||||
|
||||
------=_NextPart_000_0022_01CFD7E8.870D8B30
|
||||
Content-Type: text/plain;
|
||||
charset="us-ascii"
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
|
||||
|
||||
------=_NextPart_000_0022_01CFD7E8.870D8B30
|
||||
Content-Type: message/rfc822
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Content-Disposition: attachment
|
||||
|
||||
Received: by 10.220.39.70 with SMTP id f6csp395476vce;
|
||||
Tue, 23 Sep 2014 04:02:06 -0700 (PDT)
|
||||
Received: from mailnode3.cz.nl (mailnode3.cz.nl. [194.151.60.3])
|
||||
by mx.google.com with ESMTPS id v19si1882645wij.81.2014.09.23.04.02.04
|
||||
for <lrbalt@gmail.com>
|
||||
(version=TLSv1 cipher=RC4-SHA bits=128/128);
|
||||
Tue, 23 Sep 2014 04:02:04 -0700 (PDT)
|
||||
Return-Path: <_noreply@ohra-zorg.nl>
|
||||
From: <_noreply@ohra-zorg.nl>
|
||||
To: <lrbalt@gmail.com>
|
||||
Subject: Ingediende nota('s)
|
||||
Date: Tue, 23 Sep 2014 13:02:21 +0200
|
||||
Message-ID: <fd565d3d-e03b-4382-95f3-843755956335@MAS2103.INFRA.LOCAL>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/alternative;
|
||||
boundary="----=_NextPart_000_001E_01CFD7E8.870D6420"
|
||||
X-Mailer: Microsoft Outlook 15.0
|
||||
Thread-Index: AQHegIh7i1l3Ugf25nxZMiNc2taHEA==
|
||||
|
||||
This is a multipart message in MIME format.
|
||||
|
||||
------=_NextPart_000_001E_01CFD7E8.870D6420
|
||||
Content-Type: text/plain;
|
||||
charset="utf-8"
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
Geachte heer Balt,
|
||||
|
||||
U heeft op 23 september 2014 onderstaande declaratie ingediend.
|
||||
|
||||
Nota 1
|
||||
Gedeclareerde nota's: jinte 20-8.pdf=09
|
||||
Behandelde verzekerde: JM Balt (26-01-2006)=09
|
||||
Naam zorgverlener: Solvejg Dunnewolt=09
|
||||
Notabedrag: 60,00=09
|
||||
Nota betalen aan: LR Balt=09
|
||||
|
||||
|
||||
Aanvullende informatie bij uw nota's
|
||||
|
||||
Is er bij een of meerdere nota's sprake van een ongeval waarvoor een =
|
||||
ander aansprakelijk gesteld kan worden? Nee=09
|
||||
Heeft u bij een of meerdere nota's kosten gemaakt in het buitenland? Nee =
|
||||
|
||||
|
||||
|
||||
Declaratieformulier
|
||||
U declareert digitaal via Mijn OHRA Zorgverzekering. Daar kunt u ook een =
|
||||
declaratieformulier downloaden en uitprinten.
|
||||
U ontvangt geen papieren declaratieformulier meer per post.
|
||||
|
||||
|
||||
|
||||
Met vriendelijke groet,
|
||||
|
||||
OHRA
|
||||
|
||||
|
||||
|
||||
|
||||
_____________________________________________________________________
|
||||
Dit e-mailbericht is vertrouwelijk en uitsluitend bestemd voor de =
|
||||
geadresseerde.
|
||||
Indien u niet de beoogde ontvanger van dit e-mailbericht bent, verzoeken =
|
||||
wij u
|
||||
vriendelijk om de verzender hiervan direct op de hoogte te stellen en om =
|
||||
het
|
||||
bericht van alle locaties in uw computer en netwerk te verwijderen.
|
||||
Openbaarmaking, vermenigvuldiging, verstrekking aan en/of gebruik door =
|
||||
derden
|
||||
van dit e-mailbericht en/of deze informatie is niet toegestaan; indien =
|
||||
dit gebeurt,
|
||||
kan er sprake zijn van onrechtmatig handelen. E-mail is een informele =
|
||||
manier van
|
||||
communiceren en kan aan al dan niet opzettelijk verkeerd gebruik of =
|
||||
misbruik van
|
||||
gegevens worden blootgesteld. OHRA is niet in staat om de inhoud van de =
|
||||
informatie
|
||||
die via het internet wordt verstuurd te controleren en aanvaardt =
|
||||
daarvoor geen
|
||||
enkele aansprakelijkheid.
|
||||
_____________________________________________________________________
|
||||
|
||||
|
||||
------=_NextPart_000_001E_01CFD7E8.870D6420
|
||||
Content-Type: text/html;
|
||||
charset="utf-8"
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
|
||||
<head>
|
||||
<style type=3D"text/css">
|
||||
table,th,td
|
||||
{font-family:"arial";font-size: 10pt;}
|
||||
body
|
||||
{font-family:"arial";font-size: 10pt;}
|
||||
td
|
||||
{font-family:"arial";font-size: 10pt;}
|
||||
</style>
|
||||
</head>
|
||||
<body>Geachte heer Balt,<br /><br />U heeft op 23 september 2014 =
|
||||
onderstaande declaratie ingediend.<br /><br /><strong>Nota =
|
||||
1</strong><table><tbody><tr><td>Gedeclareerde nota's:</td><td>jinte =
|
||||
20-8.pdf</td></tr><tr><td>Behandelde verzekerde:</td><td>JM Balt =
|
||||
(26-01-2006)</td></tr><tr><td>Naam zorgverlener:</td><td>Solvejg =
|
||||
Dunnewolt</td></tr><tr><td>Notabedrag:</td><td>60,00</td></tr><tr><td>Not=
|
||||
a betalen aan:</td><td>LR Balt</td></tr></tbody></table><br /> <br =
|
||||
/><b>Aanvullende informatie bij uw nota's</b><br /><table><tr><td>Is er =
|
||||
bij een of meerdere nota's sprake van een ongeval waarvoor een ander =
|
||||
aansprakelijk gesteld kan worden?</td><td>Nee</td></tr><tr><td>Heeft u =
|
||||
bij een of meerdere nota's kosten gemaakt in het =
|
||||
buitenland?</td><td>Nee</td></tr></table><br /><br =
|
||||
/><strong>Declaratieformulier<br /></strong>U declareert digitaal via =
|
||||
Mijn OHRA Zorgverzekering. Daar kunt u ook een declaratieformulier =
|
||||
downloaden en uitprinten.<br />U ontvangt geen papieren =
|
||||
declaratieformulier meer per post.<br /><br /><br /><br />Met =
|
||||
vriendelijke groet,<br /><br />OHRA<br /><br /><br>
|
||||
<P>_____________________________________________________________________<=
|
||||
br>Dit e-mailbericht is vertrouwelijk en uitsluitend bestemd voor de =
|
||||
geadresseerde.<br>Indien u niet de beoogde ontvanger van dit =
|
||||
e-mailbericht bent, verzoeken wij u<br>vriendelijk om de verzender =
|
||||
hiervan direct op de hoogte te stellen en om het<br>bericht van alle =
|
||||
locaties in uw computer en netwerk te verwijderen.<br>Openbaarmaking, =
|
||||
vermenigvuldiging, verstrekking aan en/of gebruik door derden<br>van dit =
|
||||
e-mailbericht en/of deze informatie is niet toegestaan; indien dit =
|
||||
gebeurt,<br>kan er sprake zijn van onrechtmatig handelen. E-mail is een =
|
||||
informele manier van<br>communiceren en kan aan al dan niet opzettelijk =
|
||||
verkeerd gebruik of misbruik van<br>gegevens worden blootgesteld. OHRA =
|
||||
is niet in staat om de inhoud van de informatie<br>die via het internet =
|
||||
wordt verstuurd te controleren en aanvaardt daarvoor geen<br>enkele =
|
||||
aansprakelijkheid.<br>___________________________________________________=
|
||||
__________________</P></body>
|
||||
------=_NextPart_000_001E_01CFD7E8.870D6420--
|
||||
|
||||
------=_NextPart_000_0022_01CFD7E8.870D8B30--
|
||||
|
||||
|
|
@ -121,9 +121,9 @@ module RecurringTodos
|
|||
def test_determine_start
|
||||
travel_to Time.zone.local(2013,1,1) do
|
||||
rt = create_recurring_todo
|
||||
assert_equal "2013-01-01", rt.send(:determine_start, nil).to_date.to_s(:db), "no previous date, use today"
|
||||
assert_equal "2013-01-01", rt.send(:determine_start, nil, 1.day).to_date.to_s(:db), "no previous date, use today without offset"
|
||||
assert_equal "2013-01-02", rt.send(:determine_start, Time.zone.now, 1.day).to_date.to_s(:db), "use previous date and offset"
|
||||
assert_equal "2013-01-01 00:00:00", rt.send(:determine_start, nil).to_s(:db), "no previous date, use today"
|
||||
assert_equal "2013-01-01 00:00:00", rt.send(:determine_start, nil, 1.day).to_s(:db), "no previous date, use today without offset"
|
||||
assert_equal "2013-01-02 00:00:00", rt.send(:determine_start, Time.zone.now, 1.day).to_s(:db), "use previous date and offset"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -131,14 +131,14 @@ module RecurringTodos
|
|||
rt = create_recurring_todo
|
||||
|
||||
# march 2014 has 5 saturdays, the last will return the 5th
|
||||
assert_equal "2014-03-01", rt.send(:get_xth_day_of_month, 1, 6, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-22", rt.send(:get_xth_day_of_month, 4, 6, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-29", rt.send(:get_xth_day_of_month, 5, 6, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-01 00:00:00", rt.send(:get_xth_day_of_month, 1, 6, 3, 2014).to_s(:db)
|
||||
assert_equal "2014-03-22 00:00:00", rt.send(:get_xth_day_of_month, 4, 6, 3, 2014).to_s(:db)
|
||||
assert_equal "2014-03-29 00:00:00", rt.send(:get_xth_day_of_month, 5, 6, 3, 2014).to_s(:db)
|
||||
|
||||
# march 2014 has 4 fridays, the last will return the 4th
|
||||
assert_equal "2014-03-07", rt.send(:get_xth_day_of_month, 1, 5, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-28", rt.send(:get_xth_day_of_month, 4, 5, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-28", rt.send(:get_xth_day_of_month, 5, 5, 3, 2014).to_date.to_s(:db)
|
||||
assert_equal "2014-03-07 00:00:00", rt.send(:get_xth_day_of_month, 1, 5, 3, 2014).to_s(:db)
|
||||
assert_equal "2014-03-28 00:00:00", rt.send(:get_xth_day_of_month, 4, 5, 3, 2014).to_s(:db)
|
||||
assert_equal "2014-03-28 00:00:00", rt.send(:get_xth_day_of_month, 5, 5, 3, 2014).to_s(:db)
|
||||
|
||||
assert_raise(RuntimeError, "should check on valid weekdays"){ rt.send(:get_xth_day_of_month, 5, 9, 3, 2014) }
|
||||
assert_raise(RuntimeError, "should check on valid count x"){ rt.send(:get_xth_day_of_month, 6, 5, 3, 2014) }
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ class TodoTest < ActiveSupport::TestCase
|
|||
assert_equal "Call Bill Gates to find out how much he makes per day", @not_completed1.description
|
||||
assert_nil @not_completed1.notes
|
||||
assert @not_completed1.completed? == false
|
||||
assert_equal 1.week.ago.beginning_of_day.to_date.to_s, @not_completed1.created_at.localtime.beginning_of_day.to_date.to_s
|
||||
assert_equal 2.week.from_now.beginning_of_day.to_date.to_s, @not_completed1.due.localtime.to_date.to_s
|
||||
assert_equal 1.week.ago.beginning_of_day.strftime("%Y-%m-%d %H:%M"), @not_completed1.created_at.beginning_of_day.strftime("%Y-%m-%d %H:%M")
|
||||
assert_equal 2.week.from_now.beginning_of_day.strftime("%Y-%m-%d"), @not_completed1.due.strftime("%Y-%m-%d")
|
||||
assert_nil @not_completed1.completed_at
|
||||
assert_equal 1, @not_completed1.user_id
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue