diff --git a/test/controllers/recurring_todos_controller_test.rb b/test/controllers/recurring_todos_controller_test.rb index 30afb145..ccc3eaa3 100644 --- a/test/controllers/recurring_todos_controller_test.rb +++ b/test/controllers/recurring_todos_controller_test.rb @@ -184,7 +184,7 @@ class RecurringTodosControllerTest < ActionController::TestCase # mark as active xhr :post, :toggle_check, :id=>1, :_source_view=>"" - + recurring_todo_1 = RecurringTodo.find(1) # reload seems to not work assert recurring_todo_1.active?, "recurring todo should be active but is #{recurring_todo_1.aasm.current_state}" @@ -260,7 +260,7 @@ class RecurringTodosControllerTest < ActionController::TestCase "recurring_show_days_before"=>"0", "recurring_target"=>"due_date", "recurring_show_always" => "1", - "start_from"=>"1/10/2012", + "start_from"=>"1/10/2012", "weekly_every_x_week"=>"1", "weekly_return_monday"=>"w", "yearly_day_of_week"=>"0", @@ -378,10 +378,10 @@ 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 00:00:00 +0000", assigns['recurring_todo'].start_from.to_s + assert_equal "new recurring pattern", assigns['recurring_todo'].description + assert_equal "2013-01-02", assigns['recurring_todo'].start_from.localtime.to_date.to_s todo = assigns['recurring_todo'].todos.first - assert_equal "2013-01-02 00:00:00 +0000", todo.show_from.to_s + assert_equal "2013-01-02", todo.show_from.localtime.to_date.to_s end end @@ -419,9 +419,9 @@ class RecurringTodosControllerTest < ActionController::TestCase login_as(:admin_user) rt = recurring_todos(:call_bill_gates_every_day) - put :update, - "recurring_todo" => { - "description" => "changed", + put :update, + "recurring_todo" => { + "description" => "changed", "daily_selector" => "daily_every_x_day", "daily_every_x_days" => "2", "ends_on" => "no_end_date", @@ -433,7 +433,7 @@ class RecurringTodosControllerTest < ActionController::TestCase "recurring_todo_edit_start_from" => "2/1/2013", "end_date" => nil, "ends_on" => "no_end_date", - "id" => "#{rt.id}", + "id" => "#{rt.id}", "context_name" => "library", format: :js diff --git a/test/controllers/stats_controller_test.rb b/test/controllers/stats_controller_test.rb index 2c7e3485..d2140348 100644 --- a/test/controllers/stats_controller_test.rb +++ b/test/controllers/stats_controller_test.rb @@ -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.week.ago.utc.at_midnight, totals.first_action_at.utc.at_midnight + assert_equal 2.weeks.ago.localtime.at_midnight, totals.first_action_at.localtime.at_midnight end def test_downdrill @@ -128,15 +128,15 @@ class StatsControllerTest < ActionController::TestCase # And they should be averaged over three months assert_equal 2/3.0, assigns['actions_done_avg_last12months_array'][1], "fourth month should be excluded" assert_equal 2/3.0, assigns['actions_done_avg_last12months_array'][2], "fourth month should be included" - + assert_equal (3)/3.0, assigns['actions_created_avg_last12months_array'][1], "one every month" assert_equal (4)/3.0, assigns['actions_created_avg_last12months_array'][2], "two in fourth month" - + # And the current month should be interpolated fraction = Time.zone.now.day.to_f / Time.zone.now.end_of_month.day.to_f assert_equal (2*(1/fraction)+2)/3.0, assigns['interpolated_actions_created_this_month'], "two this month and one in the last two months" assert_equal (2)/3.0, assigns['interpolated_actions_done_this_month'], "none this month and one two the last two months" - + # And totals should be calculated assert_equal 2, assigns['max'], "max of created or completed todos in one month" end @@ -168,7 +168,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -176,7 +176,7 @@ class StatsControllerTest < ActionController::TestCase assert_response :success # only tests relevant differences with actions_done_last_12months_data - + assert_equal 31, assigns['actions_done_last30days_array'].size, "30 complete days plus 1 for the current day" assert_equal 2, assigns['max'], "two actions created on one day is max" end @@ -185,31 +185,31 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data get :actions_done_lastyears_data assert_response :success - + # only tests difference with actions_done_last_12months_data - + # And the last two months are corrected assert_equal 2/3.0, assigns['actions_done_avg_last_months_array'][23] assert_equal 2/3.0, assigns['actions_done_avg_last_months_array'][24] end - + def test_actions_completion_time_data login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats - + # When I get the chart data get :actions_completion_time_data assert_response :success - + # do not test stuff already implicitly tested in other tests assert_equal 104, assigns['max_weeks'], "two years is 104 weeks (for completed_at)" assert_equal 3, assigns['max_actions'], "3 completed within one week" @@ -222,13 +222,13 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats - + # When I get the chart data get :actions_running_time_data assert_response :success - + # do not test stuff already implicitly tested in other tests assert_equal 17, assigns['max_weeks'], "there are actions in the first 17 weeks of this year" assert_equal 2, assigns['max_actions'], "2 actions running long together" @@ -241,13 +241,13 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats - + # When I get the chart data get :actions_open_per_week_data assert_response :success - + # do not test stuff already implicitly tested in other tests assert_equal 17, assigns['max_weeks'], "there are actions in the first 17 weeks of this year" assert_equal 4, assigns['max_actions'], "4 actions running together" @@ -258,12 +258,12 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # Given todo1 is deferred (i.e. not visible) @todo_today1.show_from = Time.zone.now + 1.week @todo_today1.save - + # When I get the chart data get :actions_visible_running_time_data assert_response :success @@ -281,7 +281,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -311,7 +311,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -335,12 +335,12 @@ class StatsControllerTest < ActionController::TestCase assert_equal 14, assigns['data'].values[9], "pie slices limited to max 10; last pie contains sum of rest (in percentage)" assert_equal "(others)", assigns['data'].labels[9], "pie slices limited to max 10; last slice contains label for others" end - + def test_actions_day_of_week_all_data login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -358,7 +358,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -376,7 +376,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -389,12 +389,12 @@ class StatsControllerTest < ActionController::TestCase assert_not_nil assigns['actions_creation_hour_array'] assert_not_nil assigns['actions_completion_hour_array'] end - + def test_show_selected_actions_from_chart_avrt login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -409,7 +409,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -424,7 +424,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -439,7 +439,7 @@ class StatsControllerTest < ActionController::TestCase login_as(:admin_user) @current_user = User.find(users(:admin_user).id) @current_user.todos.delete_all - + given_todos_for_stats # When I get the chart data @@ -451,7 +451,7 @@ class StatsControllerTest < ActionController::TestCase end private - + def given_todos_for_stats # Given two todos created today @todo_today1 = @current_user.todos.create!(:description => "created today1", :context => contexts(:office)) @@ -491,7 +491,7 @@ class StatsControllerTest < ActionController::TestCase def difference_in_days(date1, date2) return ((date1.at_midnight-date2.at_midnight)/(60*60*24)).to_i end - + # assumes date1 > date2 def difference_in_weeks(date1, date2) return difference_in_days(date1, date2) / 7 diff --git a/test/fixtures/tracks_last_mail.log.old b/test/fixtures/tracks_last_mail.log.old new file mode 100644 index 00000000..a403e8f5 --- /dev/null +++ b/test/fixtures/tracks_last_mail.log.old @@ -0,0 +1,220 @@ +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 ; Wed, 24 Sep 2014 11:13:14 +0200 +Received: by mail-qc0-f175.google.com with SMTP id o8so3072914qcw.34 + for ; 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 + (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 ; 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 + (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: +In-Reply-To: +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 + (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: +Subject: Ingediende nota('s) +Date: Tue, 23 Sep 2014 13:02:21 +0200 +Message-ID: +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 + + + + +Geachte heer Balt,

U heeft op 23 september 2014 = +onderstaande declaratie ingediend.

Nota = +1
Gedeclareerde nota's:jinte = +20-8.pdf
Behandelde verzekerde:JM Balt = +(26-01-2006)
Naam zorgverlener:Solvejg = +Dunnewolt
Notabedrag:60,00
Not= +a betalen aan:LR Balt


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
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


+

_____________________________________________________________________<= +br>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-- + +------=_NextPart_000_0022_01CFD7E8.870D8B30-- +