From 965998df1854e1d2430fa5708d0bfb9a61517874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Mon, 14 Jan 2019 11:28:10 +0200 Subject: [PATCH] Fix tests. --- hc/accounts/tests/test_badges.py | 6 ++++-- hc/accounts/tests/test_close_account.py | 3 ++- hc/accounts/tests/test_login.py | 5 +++-- hc/accounts/tests/test_profile.py | 10 +++++----- hc/accounts/tests/test_pruneusers.py | 4 +++- hc/accounts/tests/test_switch_team.py | 3 ++- hc/api/tests/test_admin.py | 7 ++++--- hc/api/tests/test_bounce.py | 5 +++-- hc/api/tests/test_channel_model.py | 7 +++++-- hc/api/tests/test_check_model.py | 2 +- hc/api/tests/test_create_check.py | 4 ++-- hc/api/tests/test_list_checks.py | 2 +- hc/api/tests/test_notify.py | 4 ++-- hc/api/tests/test_pause.py | 2 +- hc/api/tests/test_ping.py | 3 ++- hc/api/tests/test_sendalerts.py | 16 ++++++++-------- hc/api/tests/test_sendreports.py | 3 ++- hc/api/tests/test_update_check.py | 18 +++++++++--------- hc/front/tests/test_channel_checks.py | 1 + hc/front/tests/test_channels.py | 14 +++++++------- hc/front/tests/test_details.py | 2 +- hc/front/tests/test_log.py | 5 +++-- hc/front/tests/test_my_checks.py | 1 + hc/front/tests/test_pause.py | 2 +- hc/front/tests/test_ping_details.py | 10 +++++----- hc/front/tests/test_remove_channel.py | 1 + hc/front/tests/test_remove_check.py | 2 +- hc/front/tests/test_status.py | 1 + hc/front/tests/test_status_single.py | 1 + hc/front/tests/test_switch_channel.py | 7 +++++-- hc/front/tests/test_unsubscribe_email.py | 1 + hc/front/tests/test_update_channel.py | 6 +++++- hc/front/tests/test_update_channel_name.py | 1 + hc/front/tests/test_update_name.py | 2 +- hc/front/tests/test_update_timeout.py | 2 +- hc/front/tests/test_verify_email.py | 1 + 36 files changed, 97 insertions(+), 67 deletions(-) diff --git a/hc/accounts/tests/test_badges.py b/hc/accounts/tests/test_badges.py index d047ea11..423a93b4 100644 --- a/hc/accounts/tests/test_badges.py +++ b/hc/accounts/tests/test_badges.py @@ -6,8 +6,10 @@ class BadgesTestCase(BaseTestCase): def test_it_shows_badges(self): self.client.login(username="alice@example.org", password="password") - Check.objects.create(user=self.alice, tags="foo a-B_1 baz@") - Check.objects.create(user=self.bob, tags="bobs-tag") + Check.objects.create(user=self.alice, tags="foo a-B_1 baz@", + project=self.project) + Check.objects.create(user=self.bob, tags="bobs-tag", + project=self.project) r = self.client.get("/accounts/profile/badges/") self.assertContains(r, "foo.svg") diff --git a/hc/accounts/tests/test_close_account.py b/hc/accounts/tests/test_close_account.py index df9a421d..2790c0fe 100644 --- a/hc/accounts/tests/test_close_account.py +++ b/hc/accounts/tests/test_close_account.py @@ -9,7 +9,8 @@ class CloseAccountTestCase(BaseTestCase): @patch("hc.payments.models.Subscription.cancel") def test_it_works(self, mock_cancel): - Check.objects.create(user=self.alice, tags="foo a-B_1 baz@") + Check.objects.create(user=self.alice, tags="foo a-B_1 baz@", + project=self.project) Subscription.objects.create(user=self.alice, subscription_id="123") self.client.login(username="alice@example.org", password="password") diff --git a/hc/accounts/tests/test_login.py b/hc/accounts/tests/test_login.py index 725a0ff6..922255dc 100644 --- a/hc/accounts/tests/test_login.py +++ b/hc/accounts/tests/test_login.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User from django.core import mail from django.test import TestCase -from hc.accounts.models import Profile +from hc.accounts.models import Profile, Project from hc.api.models import Check from django.conf import settings @@ -78,7 +78,8 @@ class LoginTestCase(TestCase): alice.set_password("password") alice.save() - check = Check.objects.create(user=alice) + project = Project.objects.create(owner=alice) + check = Check.objects.create(user=alice, project=project) form = { "action": "login", diff --git a/hc/accounts/tests/test_profile.py b/hc/accounts/tests/test_profile.py index c0a42668..47a695fa 100644 --- a/hc/accounts/tests/test_profile.py +++ b/hc/accounts/tests/test_profile.py @@ -60,7 +60,7 @@ class ProfileTestCase(BaseTestCase): self.assertEqual(self.project.api_key, "") def test_it_sends_report(self): - check = Check(name="Test Check", user=self.alice) + check = Check(name="Test Check", user=self.alice, project=self.project) check.last_ping = now() check.save() @@ -75,7 +75,7 @@ class ProfileTestCase(BaseTestCase): self.assertIn("Test Check", message.body) def test_it_skips_report_if_no_pings(self): - check = Check(name="Test Check", user=self.alice) + check = Check(name="Test Check", user=self.alice, project=self.project) check.save() sent = self.profile.send_report() @@ -84,7 +84,7 @@ class ProfileTestCase(BaseTestCase): self.assertEqual(len(mail.outbox), 0) def test_it_skips_report_if_no_recent_pings(self): - check = Check(name="Test Check", user=self.alice) + check = Check(name="Test Check", user=self.alice, project=self.project) check.last_ping = now() - td(days=365) check.save() @@ -94,7 +94,7 @@ class ProfileTestCase(BaseTestCase): self.assertEqual(len(mail.outbox), 0) def test_it_sends_nag(self): - check = Check(name="Test Check", user=self.alice) + check = Check(name="Test Check", user=self.alice, project=self.project) check.status = "down" check.last_ping = now() check.save() @@ -113,7 +113,7 @@ class ProfileTestCase(BaseTestCase): self.assertIn("Test Check", message.body) def test_it_skips_nag_if_none_down(self): - check = Check(name="Test Check", user=self.alice) + check = Check(name="Test Check", user=self.alice, project=self.project) check.last_ping = now() check.save() diff --git a/hc/accounts/tests/test_pruneusers.py b/hc/accounts/tests/test_pruneusers.py index 8e4cf0e8..9a035e09 100644 --- a/hc/accounts/tests/test_pruneusers.py +++ b/hc/accounts/tests/test_pruneusers.py @@ -3,6 +3,7 @@ from datetime import timedelta from django.contrib.auth.models import User from django.utils import timezone from hc.accounts.management.commands.pruneusers import Command +from hc.accounts.models import Project from hc.api.models import Check from hc.test import BaseTestCase @@ -15,7 +16,8 @@ class PruneUsersTestCase(BaseTestCase): self.charlie.save() # Charlie has one demo check - Check(user=self.charlie).save() + project =Project.objects.create(owner=self.charlie) + Check(user=self.charlie, project=project).save() Command().handle() diff --git a/hc/accounts/tests/test_switch_team.py b/hc/accounts/tests/test_switch_team.py index 2e44f3d9..2f355ea3 100644 --- a/hc/accounts/tests/test_switch_team.py +++ b/hc/accounts/tests/test_switch_team.py @@ -8,7 +8,8 @@ class SwitchTeamTestCase(BaseTestCase): self.bobs_profile.current_project = None self.bobs_profile.save() - c = Check(user=self.alice, name="This belongs to Alice") + c = Check(user=self.alice, name="This belongs to Alice", + project=self.project) c.save() self.client.login(username="bob@example.org", password="password") diff --git a/hc/api/tests/test_admin.py b/hc/api/tests/test_admin.py index 20e0a075..b3f92582 100644 --- a/hc/api/tests/test_admin.py +++ b/hc/api/tests/test_admin.py @@ -6,7 +6,8 @@ class ApiAdminTestCase(BaseTestCase): def setUp(self): super(ApiAdminTestCase, self).setUp() - self.check = Check.objects.create(user=self.alice, tags="foo bar") + self.check = Check.objects.create(user=self.alice, tags="foo bar", + project=self.project) self.alice.is_staff = True self.alice.is_superuser = True @@ -16,7 +17,7 @@ class ApiAdminTestCase(BaseTestCase): self.client.login(username="alice@example.org", password="password") Channel.objects.create(user=self.alice, kind="pushbullet", - value="test-token") + value="test-token", project=self.project) r = self.client.get("/admin/api/channel/") self.assertContains(r, "Pushbullet") @@ -25,7 +26,7 @@ class ApiAdminTestCase(BaseTestCase): self.client.login(username="alice@example.org", password="password") Channel.objects.create(user=self.alice, kind="email", - value="foo@example.org") + value="foo@example.org", project=self.project) r = self.client.get("/admin/api/channel/") self.assertContains(r, "Email (unconfirmed)") diff --git a/hc/api/tests/test_bounce.py b/hc/api/tests/test_bounce.py index f166b445..a41b0200 100644 --- a/hc/api/tests/test_bounce.py +++ b/hc/api/tests/test_bounce.py @@ -9,10 +9,11 @@ class BounceTestCase(BaseTestCase): def setUp(self): super(BounceTestCase, self).setUp() - self.check = Check(user=self.alice, status="up") + self.check = Check(user=self.alice, status="up", project=self.project) self.check.save() - self.channel = Channel(user=self.alice, kind="email") + self.channel = Channel(user=self.alice, kind="email", + project=self.project) self.channel.value = "alice@example.org" self.channel.email_verified = True self.channel.save() diff --git a/hc/api/tests/test_channel_model.py b/hc/api/tests/test_channel_model.py index 1e8c7451..0a6a2eac 100644 --- a/hc/api/tests/test_channel_model.py +++ b/hc/api/tests/test_channel_model.py @@ -11,10 +11,13 @@ class ChannelModelTestCase(BaseTestCase): def test_it_refreshes_hipchat_access_token(self, mock_post): mock_post.return_value.json.return_value = {"expires_in": 100} - channel = Channel(kind="hipchat", user=self.alice, value=json.dumps({ + value = json.dumps({ "oauthId": "foo", "oauthSecret": "bar" - })) + }) + + channel = Channel(kind="hipchat", user=self.alice, + project=self.project, value=value) channel.refresh_hipchat_access_token() diff --git a/hc/api/tests/test_check_model.py b/hc/api/tests/test_check_model.py index ea0ee595..26e6827d 100644 --- a/hc/api/tests/test_check_model.py +++ b/hc/api/tests/test_check_model.py @@ -155,7 +155,7 @@ class CheckModelTestCase(BaseTestCase): dt = timezone.make_aware(datetime(2000, 1, 1), timezone=timezone.utc) # Expect ping every round hour - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.kind = "cron" check.schedule = "0 * * * *" check.status = "up" diff --git a/hc/api/tests/test_create_check.py b/hc/api/tests/test_create_check.py index e3725e82..cdd89ea6 100644 --- a/hc/api/tests/test_create_check.py +++ b/hc/api/tests/test_create_check.py @@ -77,7 +77,7 @@ class CreateCheckTestCase(BaseTestCase): self.assertEqual(r.status_code, 201) def test_it_assigns_channels(self): - channel = Channel(user=self.alice) + channel = Channel(user=self.alice, project=self.project) channel.save() r = self.post({"api_key": "X" * 32, "channels": "*"}) @@ -138,7 +138,7 @@ class CreateCheckTestCase(BaseTestCase): expected_fragment="name is too long") def test_unique_accepts_only_whitelisted_values(self): - existing = Check(user=self.alice, name="Foo") + existing = Check(user=self.alice, name="Foo", project=self.project) existing.save() self.post({ diff --git a/hc/api/tests/test_list_checks.py b/hc/api/tests/test_list_checks.py index fcadf291..9886fc76 100644 --- a/hc/api/tests/test_list_checks.py +++ b/hc/api/tests/test_list_checks.py @@ -30,7 +30,7 @@ class ListChecksTestCase(BaseTestCase): self.a2.tags = "a2-tag" self.a2.save() - self.c1 = Channel.objects.create(user=self.alice) + self.c1 = Channel.objects.create(user=self.alice, project=self.project) self.a1.channel_set.add(self.c1) def get(self): diff --git a/hc/api/tests/test_notify.py b/hc/api/tests/test_notify.py index c9bc90fa..4d91fac9 100644 --- a/hc/api/tests/test_notify.py +++ b/hc/api/tests/test_notify.py @@ -14,13 +14,13 @@ from requests.exceptions import ConnectionError, Timeout class NotifyTestCase(BaseTestCase): def _setup_data(self, kind, value, status="down", email_verified=True): - self.check = Check() + self.check = Check(project=self.project) self.check.status = status self.check.user = self.alice self.check.last_ping = now() - td(minutes=61) self.check.save() - self.channel = Channel(user=self.alice) + self.channel = Channel(user=self.alice, project=self.project) self.channel.kind = kind self.channel.value = value self.channel.email_verified = email_verified diff --git a/hc/api/tests/test_pause.py b/hc/api/tests/test_pause.py index 6f97ccff..6785d23d 100644 --- a/hc/api/tests/test_pause.py +++ b/hc/api/tests/test_pause.py @@ -36,7 +36,7 @@ class PauseTestCase(BaseTestCase): self.assertEqual(r.status_code, 405) def test_it_validates_ownership(self): - check = Check(user=self.bob, status="up") + check = Check(user=self.bob, status="up", project=self.bobs_project) check.save() url = "/api/v1/checks/%s/pause" % check.code diff --git a/hc/api/tests/test_ping.py b/hc/api/tests/test_ping.py index 11b689e2..1ac228ad 100644 --- a/hc/api/tests/test_ping.py +++ b/hc/api/tests/test_ping.py @@ -10,7 +10,8 @@ class PingTestCase(BaseTestCase): def setUp(self): super().setUp() - self.check = Check.objects.create(user=self.alice) + self.check = Check.objects.create(user=self.alice, + project=self.project) def test_it_works(self): r = self.client.get("/ping/%s/" % self.check.code) diff --git a/hc/api/tests/test_sendalerts.py b/hc/api/tests/test_sendalerts.py index 4da2d559..1eed49b1 100644 --- a/hc/api/tests/test_sendalerts.py +++ b/hc/api/tests/test_sendalerts.py @@ -12,7 +12,7 @@ from hc.test import BaseTestCase class SendAlertsTestCase(BaseTestCase): def test_it_handles_grace_period(self): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) # 1 day 30 minutes after ping the check is in grace period: check.last_ping = now() - td(days=1, minutes=30) check.alert_after = check.last_ping + td(days=1, hours=1) @@ -25,7 +25,7 @@ class SendAlertsTestCase(BaseTestCase): self.assertEqual(Flip.objects.count(), 0) def test_it_creates_a_flip_when_check_goes_down(self): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) check.last_ping = now() - td(days=2) check.alert_after = check.last_ping + td(days=1, hours=1) check.save() @@ -48,7 +48,7 @@ class SendAlertsTestCase(BaseTestCase): @patch("hc.api.management.commands.sendalerts.notify_on_thread") def test_it_processes_flip(self, mock_notify): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) check.last_ping = now() check.alert_after = check.last_ping + td(days=1, hours=1) check.save() @@ -72,7 +72,7 @@ class SendAlertsTestCase(BaseTestCase): @patch("hc.api.management.commands.sendalerts.notify_on_thread") def test_it_updates_alert_after(self, mock_notify): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) check.last_ping = now() - td(hours=1) check.alert_after = check.last_ping check.save() @@ -92,7 +92,7 @@ class SendAlertsTestCase(BaseTestCase): @patch("hc.api.management.commands.sendalerts.notify") def test_it_works_synchronously(self, mock_notify): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) check.last_ping = now() - td(days=2) check.alert_after = check.last_ping + td(days=1, hours=1) check.save() @@ -107,7 +107,7 @@ class SendAlertsTestCase(BaseTestCase): self.profile.nag_period = td(hours=1) self.profile.save() - check = Check(user=self.alice, status="down") + check = Check(user=self.alice, status="down", project=self.project) check.last_ping = now() - td(days=2) check.save() @@ -125,7 +125,7 @@ class SendAlertsTestCase(BaseTestCase): self.bobs_profile.nag_period = td(hours=1) self.bobs_profile.save() - check = Check(user=self.alice, status="down") + check = Check(user=self.alice, status="down", project=self.project) check.last_ping = now() - td(days=2) check.save() @@ -145,7 +145,7 @@ class SendAlertsTestCase(BaseTestCase): self.profile.next_nag_date = original_nag_date self.profile.save() - check = Check(user=self.alice, status="down") + check = Check(user=self.alice, status="down", project=self.project) check.last_ping = now() - td(days=2) check.save() diff --git a/hc/api/tests/test_sendreports.py b/hc/api/tests/test_sendreports.py index 2445b96c..2670b07e 100644 --- a/hc/api/tests/test_sendreports.py +++ b/hc/api/tests/test_sendreports.py @@ -5,7 +5,7 @@ from django.utils.timezone import now from hc.api.management.commands.sendreports import Command from hc.api.models import Check from hc.test import BaseTestCase -from mock import Mock, patch +from mock import Mock class SendAlertsTestCase(BaseTestCase): @@ -25,6 +25,7 @@ class SendAlertsTestCase(BaseTestCase): # And it needs at least one check that has been pinged. self.check = Check(user=self.alice, last_ping=now()) + self.check.project = self.project self.check.status = "down" self.check.save() diff --git a/hc/api/tests/test_update_check.py b/hc/api/tests/test_update_check.py index a3c28861..e4a6600e 100644 --- a/hc/api/tests/test_update_check.py +++ b/hc/api/tests/test_update_check.py @@ -51,7 +51,7 @@ class UpdateCheckTestCase(BaseTestCase): self.assertIn("POST", r["Access-Control-Allow-Methods"]) def test_it_unassigns_channels(self): - Channel.objects.create(user=self.alice) + Channel.objects.create(user=self.alice, project=self.project) self.check.assign_all_channels() r = self.post(self.check.code, { @@ -78,7 +78,7 @@ class UpdateCheckTestCase(BaseTestCase): self.assertEqual(r.status_code, 404) def test_it_validates_ownership(self): - check = Check(user=self.bob, status="up") + check = Check(user=self.bob, status="up", project=self.bobs_project) check.save() r = self.post(check.code, {"api_key": "X" * 32}) @@ -96,10 +96,10 @@ class UpdateCheckTestCase(BaseTestCase): self.assertEqual(self.check.kind, "simple") def test_it_sets_single_channel(self): - channel = Channel.objects.create(user=self.alice) + channel = Channel.objects.create(user=self.alice, project=self.project) # Create another channel so we can test that only the first one # gets assigned: - Channel.objects.create(user=self.alice) + Channel.objects.create(user=self.alice, project=self.project) r = self.post(self.check.code, { "api_key": "X" * 32, @@ -113,8 +113,8 @@ class UpdateCheckTestCase(BaseTestCase): self.assertEqual(self.check.channel_set.first().code, channel.code) def test_it_handles_comma_separated_channel_codes(self): - c1 = Channel.objects.create(user=self.alice) - c2 = Channel.objects.create(user=self.alice) + c1 = Channel.objects.create(user=self.alice, project=self.project) + c2 = Channel.objects.create(user=self.alice, project=self.project) r = self.post(self.check.code, { "api_key": "X" * 32, "channels": "%s,%s" % (c1.code, c2.code) @@ -126,8 +126,8 @@ class UpdateCheckTestCase(BaseTestCase): self.assertEqual(self.check.channel_set.count(), 2) def test_it_handles_asterix(self): - Channel.objects.create(user=self.alice) - Channel.objects.create(user=self.alice) + Channel.objects.create(user=self.alice, project=self.project) + Channel.objects.create(user=self.alice, project=self.project) r = self.post(self.check.code, { "api_key": "X" * 32, "channels": "*" @@ -139,7 +139,7 @@ class UpdateCheckTestCase(BaseTestCase): self.assertEqual(self.check.channel_set.count(), 2) def test_it_ignores_channels_if_channels_key_missing(self): - Channel.objects.create(user=self.alice) + Channel.objects.create(user=self.alice, project=self.project) self.check.assign_all_channels() r = self.post(self.check.code, {"api_key": "X" * 32}) diff --git a/hc/front/tests/test_channel_checks.py b/hc/front/tests/test_channel_checks.py index a9f09726..130ee9a2 100644 --- a/hc/front/tests/test_channel_checks.py +++ b/hc/front/tests/test_channel_checks.py @@ -7,6 +7,7 @@ class ChannelChecksTestCase(BaseTestCase): def setUp(self): super(ChannelChecksTestCase, self).setUp() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.value = "alice@example.org" self.channel.save() diff --git a/hc/front/tests/test_channels.py b/hc/front/tests/test_channels.py index 32aa23c0..afbff8ab 100644 --- a/hc/front/tests/test_channels.py +++ b/hc/front/tests/test_channels.py @@ -7,7 +7,7 @@ from hc.test import BaseTestCase class ChannelsTestCase(BaseTestCase): def test_it_formats_complex_slack_value(self): - ch = Channel(kind="slack", user=self.alice) + ch = Channel(kind="slack", user=self.alice, project=self.project) ch.value = json.dumps({ "ok": True, "team_name": "foo-team", @@ -24,7 +24,7 @@ class ChannelsTestCase(BaseTestCase): self.assertContains(r, "#bar") def test_it_shows_webhook_post_data(self): - ch = Channel(kind="webhook", user=self.alice) + ch = Channel(kind="webhook", user=self.alice, project=self.project) ch.value = "http://down.example.com\nhttp://up.example.com\nfoobar" ch.save() @@ -38,7 +38,7 @@ class ChannelsTestCase(BaseTestCase): self.assertContains(r, "foobar") def test_it_shows_pushover_details(self): - ch = Channel(kind="po", user=self.alice) + ch = Channel(kind="po", user=self.alice, project=self.project) ch.value = "fake-key|0" ch.save() @@ -49,10 +49,10 @@ class ChannelsTestCase(BaseTestCase): self.assertContains(r, "(normal priority)") def test_it_shows_disabled_email(self): - check = Check(user=self.alice, status="up") + check = Check(user=self.alice, status="up", project=self.project) check.save() - channel = Channel(user=self.alice, kind="email") + channel = Channel(user=self.alice, kind="email", project=self.project) channel.value = "alice@example.org" channel.save() @@ -65,7 +65,7 @@ class ChannelsTestCase(BaseTestCase): self.assertContains(r, "Disabled") def test_it_shows_unconfirmed_email(self): - channel = Channel(user=self.alice, kind="email") + channel = Channel(user=self.alice, kind="email", project=self.project) channel.value = "alice@example.org" channel.save() @@ -75,7 +75,7 @@ class ChannelsTestCase(BaseTestCase): self.assertContains(r, "Unconfirmed") def test_it_shows_sms_label(self): - ch = Channel(kind="sms", user=self.alice) + ch = Channel(kind="sms", user=self.alice, project=self.project) ch.value = json.dumps({"value": "+123", "label": "My Phone"}) ch.save() diff --git a/hc/front/tests/test_details.py b/hc/front/tests/test_details.py index c4e69740..2d35e5bf 100644 --- a/hc/front/tests/test_details.py +++ b/hc/front/tests/test_details.py @@ -6,7 +6,7 @@ class DetailsTestCase(BaseTestCase): def setUp(self): super(DetailsTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() ping = Ping(owner=self.check) diff --git a/hc/front/tests/test_log.py b/hc/front/tests/test_log.py index 868717b3..89c27cca 100644 --- a/hc/front/tests/test_log.py +++ b/hc/front/tests/test_log.py @@ -6,7 +6,7 @@ class LogTestCase(BaseTestCase): def setUp(self): super(LogTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() ping = Ping(owner=self.check) @@ -55,7 +55,7 @@ class LogTestCase(BaseTestCase): self.assertEqual(r.status_code, 404) def test_it_shows_pushover_notifications(self): - ch = Channel(kind="po", user=self.alice) + ch = Channel(kind="po", user=self.alice, project=self.project) ch.save() Notification(owner=self.check, channel=ch, check_status="down").save() @@ -68,6 +68,7 @@ class LogTestCase(BaseTestCase): def test_it_shows_webhook_notifications(self): ch = Channel(kind="webhook", user=self.alice, value="foo/$NAME") + ch.project = self.project ch.save() Notification(owner=self.check, channel=ch, check_status="down").save() diff --git a/hc/front/tests/test_my_checks.py b/hc/front/tests/test_my_checks.py index 646ffb1b..0673e3b2 100644 --- a/hc/front/tests/test_my_checks.py +++ b/hc/front/tests/test_my_checks.py @@ -9,6 +9,7 @@ class MyChecksTestCase(BaseTestCase): def setUp(self): super(MyChecksTestCase, self).setUp() self.check = Check(user=self.alice, name="Alice Was Here") + self.check.project = self.project self.check.save() def test_it_works(self): diff --git a/hc/front/tests/test_pause.py b/hc/front/tests/test_pause.py index d06da671..370bcbe6 100644 --- a/hc/front/tests/test_pause.py +++ b/hc/front/tests/test_pause.py @@ -9,7 +9,7 @@ class PauseTestCase(BaseTestCase): def setUp(self): super(PauseTestCase, self).setUp() - self.check = Check(user=self.alice, status="up") + self.check = Check(user=self.alice, status="up", project=self.project) self.check.save() self.url = "/checks/%s/pause/" % self.check.code diff --git a/hc/front/tests/test_ping_details.py b/hc/front/tests/test_ping_details.py index b1c96f19..9847a371 100644 --- a/hc/front/tests/test_ping_details.py +++ b/hc/front/tests/test_ping_details.py @@ -5,7 +5,7 @@ from hc.test import BaseTestCase class LastPingTestCase(BaseTestCase): def test_it_works(self): - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.save() Ping.objects.create(owner=check, body="this is body") @@ -15,7 +15,7 @@ class LastPingTestCase(BaseTestCase): self.assertContains(r, "this is body", status_code=200) def test_it_shows_fail(self): - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.save() Ping.objects.create(owner=check, kind="fail") @@ -25,7 +25,7 @@ class LastPingTestCase(BaseTestCase): self.assertContains(r, "/fail", status_code=200) def test_it_shows_start(self): - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.save() Ping.objects.create(owner=check, kind="start") @@ -35,7 +35,7 @@ class LastPingTestCase(BaseTestCase): self.assertContains(r, "/start", status_code=200) def test_it_accepts_n(self): - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.save() # remote_addr, scheme, method, ua, body: @@ -54,7 +54,7 @@ class LastPingTestCase(BaseTestCase): self.bobs_profile.current_team = None self.bobs_profile.save() - check = Check(user=self.alice) + check = Check(user=self.alice, project=self.project) check.save() Ping.objects.create(owner=check, body="this is body") diff --git a/hc/front/tests/test_remove_channel.py b/hc/front/tests/test_remove_channel.py index 6189ebfb..b12add80 100644 --- a/hc/front/tests/test_remove_channel.py +++ b/hc/front/tests/test_remove_channel.py @@ -7,6 +7,7 @@ class RemoveChannelTestCase(BaseTestCase): def setUp(self): super(RemoveChannelTestCase, self).setUp() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.value = "alice@example.org" self.channel.save() diff --git a/hc/front/tests/test_remove_check.py b/hc/front/tests/test_remove_check.py index cd5042e6..c432e4b1 100644 --- a/hc/front/tests/test_remove_check.py +++ b/hc/front/tests/test_remove_check.py @@ -6,7 +6,7 @@ class RemoveCheckTestCase(BaseTestCase): def setUp(self): super(RemoveCheckTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() self.remove_url = "/checks/%s/remove/" % self.check.code diff --git a/hc/front/tests/test_status.py b/hc/front/tests/test_status.py index 6a128cb7..b1784a5e 100644 --- a/hc/front/tests/test_status.py +++ b/hc/front/tests/test_status.py @@ -7,6 +7,7 @@ class MyChecksTestCase(BaseTestCase): def setUp(self): super(MyChecksTestCase, self).setUp() self.check = Check(user=self.alice, name="Alice Was Here") + self.check.project = self.project self.check.tags = "foo" self.check.save() diff --git a/hc/front/tests/test_status_single.py b/hc/front/tests/test_status_single.py index c46ca98c..c868a1ac 100644 --- a/hc/front/tests/test_status_single.py +++ b/hc/front/tests/test_status_single.py @@ -7,6 +7,7 @@ class StatusSingleTestCase(BaseTestCase): def setUp(self): super(StatusSingleTestCase, self).setUp() self.check = Check(user=self.alice, name="Alice Was Here") + self.check.project = self.project self.check.save() def test_it_works(self): diff --git a/hc/front/tests/test_switch_channel.py b/hc/front/tests/test_switch_channel.py index 48495065..349052cc 100644 --- a/hc/front/tests/test_switch_channel.py +++ b/hc/front/tests/test_switch_channel.py @@ -1,3 +1,4 @@ +from hc.accounts.models import Project from hc.api.models import Channel, Check from hc.test import BaseTestCase @@ -6,10 +7,11 @@ class SwitchChannelTestCase(BaseTestCase): def setUp(self): super(SwitchChannelTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.value = "alice@example.org" self.channel.save() @@ -35,7 +37,8 @@ class SwitchChannelTestCase(BaseTestCase): self.assertEqual(r.status_code, 404) def test_it_checks_channels_ownership(self): - cc = Check(user=self.charlie) + charlies_project = Project.objects.create(owner=self.charlie) + cc = Check(user=self.charlie, project=charlies_project) cc.save() # Charlie will try to assign Alice's channel to his check: diff --git a/hc/front/tests/test_unsubscribe_email.py b/hc/front/tests/test_unsubscribe_email.py index ab2926ab..a9d490cf 100644 --- a/hc/front/tests/test_unsubscribe_email.py +++ b/hc/front/tests/test_unsubscribe_email.py @@ -7,6 +7,7 @@ class UnsubscribeEmailTestCase(BaseTestCase): def setUp(self): super(UnsubscribeEmailTestCase, self).setUp() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.value = "alice@example.org" self.channel.save() diff --git a/hc/front/tests/test_update_channel.py b/hc/front/tests/test_update_channel.py index 050dfbc2..8d3d87fa 100644 --- a/hc/front/tests/test_update_channel.py +++ b/hc/front/tests/test_update_channel.py @@ -1,3 +1,4 @@ +from hc.accounts.models import Project from hc.api.models import Channel, Check from hc.test import BaseTestCase @@ -6,10 +7,11 @@ class UpdateChannelTestCase(BaseTestCase): def setUp(self): super(UpdateChannelTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.email = "alice@example.org" self.channel.save() @@ -50,7 +52,9 @@ class UpdateChannelTestCase(BaseTestCase): assert r.status_code == 403 def test_it_checks_check_user(self): + charlies_project = Project.objects.create(owner=self.charlie) charlies_channel = Channel(user=self.charlie, kind="email") + charlies_channel.project = charlies_project charlies_channel.email = "charlie@example.org" charlies_channel.save() diff --git a/hc/front/tests/test_update_channel_name.py b/hc/front/tests/test_update_channel_name.py index 7ed4864e..aa121975 100644 --- a/hc/front/tests/test_update_channel_name.py +++ b/hc/front/tests/test_update_channel_name.py @@ -7,6 +7,7 @@ class UpdateChannelNameTestCase(BaseTestCase): def setUp(self): super(UpdateChannelNameTestCase, self).setUp() self.channel = Channel(kind="email", user=self.alice) + self.channel.project = self.project self.channel.save() self.url = "/integrations/%s/name/" % self.channel.code diff --git a/hc/front/tests/test_update_name.py b/hc/front/tests/test_update_name.py index e238fff7..9e087a13 100644 --- a/hc/front/tests/test_update_name.py +++ b/hc/front/tests/test_update_name.py @@ -6,7 +6,7 @@ class UpdateNameTestCase(BaseTestCase): def setUp(self): super(UpdateNameTestCase, self).setUp() - self.check = Check(user=self.alice) + self.check = Check(user=self.alice, project=self.project) self.check.save() self.url = "/checks/%s/name/" % self.check.code diff --git a/hc/front/tests/test_update_timeout.py b/hc/front/tests/test_update_timeout.py index c8512f2d..055433a5 100644 --- a/hc/front/tests/test_update_timeout.py +++ b/hc/front/tests/test_update_timeout.py @@ -9,7 +9,7 @@ class UpdateTimeoutTestCase(BaseTestCase): def setUp(self): super(UpdateTimeoutTestCase, self).setUp() - self.check = Check(user=self.alice, status="up") + self.check = Check(user=self.alice, status="up", project=self.project) self.check.last_ping = timezone.now() self.check.save() diff --git a/hc/front/tests/test_verify_email.py b/hc/front/tests/test_verify_email.py index 5ad56703..e5c41a18 100644 --- a/hc/front/tests/test_verify_email.py +++ b/hc/front/tests/test_verify_email.py @@ -7,6 +7,7 @@ class VerifyEmailTestCase(BaseTestCase): def setUp(self): super(VerifyEmailTestCase, self).setUp() self.channel = Channel(user=self.alice, kind="email") + self.channel.project = self.project self.channel.value = "alice@example.org" self.channel.save()