Browse Source

Fix missing Resume button. Fixes #421

pull/426/head
Pēteris Caune 4 years ago
parent
commit
bd98174d4c
No known key found for this signature in database GPG Key ID: E28D7679E9A9EDE2
3 changed files with 27 additions and 7 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +25
    -6
      hc/front/tests/test_status_single.py
  3. +1
    -1
      hc/front/views.py

+ 1
- 0
CHANGELOG.md View File

@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
- Handle excessively long email addresses in the team member invite form
- Don't allow duplicate team memberships
- When copying a check, copy all fields from the "Filtering Rules" dialog (#417)
- Fix missing Resume button (#421)
## v1.16.0 - 2020-08-04


+ 25
- 6
hc/front/tests/test_status_single.py View File

@ -8,9 +8,11 @@ class StatusSingleTestCase(BaseTestCase):
self.check = Check(project=self.project, name="Alice Was Here")
self.check.save()
self.url = "/checks/%s/status/" % self.check.code
def test_it_works(self):
self.client.login(username="[email protected]", password="password")
r = self.client.get("/checks/%s/status/" % self.check.code)
r = self.client.get(self.url)
doc = r.json()
self.assertEqual(doc["status"], "new")
@ -24,7 +26,7 @@ class StatusSingleTestCase(BaseTestCase):
self.check.save()
self.client.login(username="[email protected]", password="password")
r = self.client.get("/checks/%s/status/" % self.check.code)
r = self.client.get(self.url)
doc = r.json()
self.assertEqual(doc["status"], "up")
@ -38,7 +40,7 @@ class StatusSingleTestCase(BaseTestCase):
self.check.save()
timestamp = str(p.created.timestamp())
url = "/checks/%s/status/?u=%s" % (self.check.code, timestamp)
url = self.url + "?u=%s" % timestamp
self.client.login(username="[email protected]", password="password")
r = self.client.get(url)
@ -48,7 +50,7 @@ class StatusSingleTestCase(BaseTestCase):
def test_it_allows_cross_team_access(self):
self.client.login(username="[email protected]", password="password")
r = self.client.get("/checks/%s/status/" % self.check.code)
r = self.client.get(self.url)
self.assertEqual(r.status_code, 200)
def test_it_handles_manual_resume(self):
@ -57,8 +59,25 @@ class StatusSingleTestCase(BaseTestCase):
self.check.save()
self.client.login(username="[email protected]", password="password")
r = self.client.get("/checks/%s/status/" % self.check.code)
r = self.client.get(self.url)
doc = r.json()
self.assertEqual(doc["status"], "paused")
self.assertIn("will ignore pings until resumed", doc["status_text"])
self.assertIn("resume-btn", doc["status_text"])
def test_resume_requires_rw_access(self):
self.bobs_membership.rw = False
self.bobs_membership.save()
self.check.status = "paused"
self.check.manual_resume = True
self.check.save()
self.client.login(username="[email protected]", password="password")
r = self.client.get(self.url)
doc = r.json()
self.assertEqual(doc["status"], "paused")
self.assertTrue("will ignore pings until resumed" in doc["status_text"])
self.assertIn("will ignore pings until resumed", doc["status_text"])
self.assertNotIn("resume-btn", doc["status_text"])

+ 1
- 1
hc/front/views.py View File

@ -653,7 +653,7 @@ def status_single(request, code):
doc = {
"status": status,
"status_text": STATUS_TEXT_TMPL.render({"check": check}),
"status_text": STATUS_TEXT_TMPL.render({"check": check, "rw": rw}),
"title": down_title(check),
"updated": updated,
}


Loading…
Cancel
Save