From 76c56ad81d4b680a7b5025b86779e388be7103e8 Mon Sep 17 00:00:00 2001 From: Ricky Date: Sun, 4 Feb 2018 12:40:49 +0530 Subject: [PATCH] webhooks/beeminder: Make deadline time (time_remain) positive. --- zerver/webhooks/beeminder/fixtures/derail.json | 2 +- zerver/webhooks/beeminder/fixtures/derail_pm.json | 2 +- zerver/webhooks/beeminder/tests.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zerver/webhooks/beeminder/fixtures/derail.json b/zerver/webhooks/beeminder/fixtures/derail.json index 41d0bb98be..dfcf448729 100644 --- a/zerver/webhooks/beeminder/fixtures/derail.json +++ b/zerver/webhooks/beeminder/fixtures/derail.json @@ -11,7 +11,7 @@ "goal_type": "gainer", "autodata": null, "healthkitmetric": "", - "losedate": 1515759100, + "losedate": 1517759100, "deadline": -4500, "leadtime": 0, "alertstart": 81720, diff --git a/zerver/webhooks/beeminder/fixtures/derail_pm.json b/zerver/webhooks/beeminder/fixtures/derail_pm.json index 82cfb96c8b..f120c718c6 100644 --- a/zerver/webhooks/beeminder/fixtures/derail_pm.json +++ b/zerver/webhooks/beeminder/fixtures/derail_pm.json @@ -11,7 +11,7 @@ "goal_type": "gainer", "autodata": null, "healthkitmetric": "", - "losedate": 1515759100, + "losedate": 1517759100, "deadline": -4500, "leadtime": 0, "alertstart": 81720, diff --git a/zerver/webhooks/beeminder/tests.py b/zerver/webhooks/beeminder/tests.py index 2c1c92c89c..4a4535d491 100644 --- a/zerver/webhooks/beeminder/tests.py +++ b/zerver/webhooks/beeminder/tests.py @@ -3,7 +3,7 @@ import time as t from typing import Text from zerver.lib.test_classes import WebhookTestCase current_time = float(t.time()) -time = (float(1515759100) - current_time)/float(3600) +time_delta_in_hours = (float(1517759100) - current_time)/float(3600) class BeeminderHookTests(WebhookTestCase): STREAM_NAME = 'beeminder' @@ -12,7 +12,7 @@ class BeeminderHookTests(WebhookTestCase): def test_beeminder_derail(self) -> None: expected_subject = u"beekeeper" expected_message = u"Hello **aaron**! I am the Beeminder bot! :octopus: \n You are going to derail \ - from goal **gainweight** in **{:0.1f} hours** \n You need **+2 in 7 days (60)** to avoid derailing \n * Pledge: **0$** :relieved:".format(time) + from goal **gainweight** in **{:0.1f} hours** \n You need **+2 in 7 days (60)** to avoid derailing \n * Pledge: **0$** :relieved:".format(time_delta_in_hours) self.send_and_test_stream_message('derail', expected_subject, expected_message, @@ -25,7 +25,7 @@ class BeeminderHookTests(WebhookTestCase): user_ip="127.0.0.1" ) expected_message = u"I am the Beeminder bot! :octopus: \n You are going to derail from \ - goal **gainweight** in **{:0.1f} hours** \n You need **+2 in 7 days (60)** to avoid derailing \n * Pledge: **5$**:worried:".format(time) + goal **gainweight** in **{:0.1f} hours** \n You need **+2 in 7 days (60)** to avoid derailing \n * Pledge: **5$**:worried:".format(time_delta_in_hours) self.send_and_test_private_message('derail_pm', expected_message, content_type="application/json")