From 077bc45b12c7ae2a32d60072e0a1cf13f22812e7 Mon Sep 17 00:00:00 2001 From: someposer Date: Fri, 3 Nov 2017 19:56:38 -0500 Subject: [PATCH] Sorting keys on Webhook JSON value for consistent unit testing. --- hc/front/forms.py | 2 +- hc/front/tests/test_add_webhook.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hc/front/forms.py b/hc/front/forms.py index 7f65659d..babae8b0 100644 --- a/hc/front/forms.py +++ b/hc/front/forms.py @@ -69,7 +69,7 @@ class AddWebhookForm(forms.Form): headers = forms.CharField(max_length=1000, required=False) def get_value(self): - return json.dumps(self.cleaned_data) + return json.dumps(self.cleaned_data, sort_keys=True) phone_validator = RegexValidator(regex='^\+\d{5,15}$', diff --git a/hc/front/tests/test_add_webhook.py b/hc/front/tests/test_add_webhook.py index 1f5d09ae..5db65e86 100644 --- a/hc/front/tests/test_add_webhook.py +++ b/hc/front/tests/test_add_webhook.py @@ -18,7 +18,7 @@ class AddWebhookTestCase(BaseTestCase): self.assertRedirects(r, "/integrations/") c = Channel.objects.get() - self.assertEqual(c.value, '{"url_down": "http://foo.com", "url_up": "https://bar.com", "post_data": "", "headers": ""}') + self.assertEqual(c.value, '{"headers": "", "post_data": "", "url_down": "http://foo.com", "url_up": "https://bar.com"}') def test_it_adds_webhook_using_team_access(self): form = {"url_down": "http://foo.com", "url_up": "https://bar.com"} @@ -30,7 +30,7 @@ class AddWebhookTestCase(BaseTestCase): c = Channel.objects.get() self.assertEqual(c.user, self.alice) - self.assertEqual(c.value, '{"url_down": "http://foo.com", "url_up": "https://bar.com", "post_data": "", "headers": ""}') + self.assertEqual(c.value, '{"headers": "", "post_data": "", "url_down": "http://foo.com", "url_up": "https://bar.com"}') def test_it_rejects_bad_urls(self): urls = [ @@ -59,7 +59,7 @@ class AddWebhookTestCase(BaseTestCase): self.client.post(self.url, form) c = Channel.objects.get() - self.assertEqual(c.value, '{"url_down": "", "url_up": "http://foo.com", "post_data": "", "headers": ""}') + self.assertEqual(c.value, '{"headers": "", "post_data": "", "url_down": "", "url_up": "http://foo.com"}') def test_it_adds_post_data(self): form = {"url_down": "http://foo.com", "post_data": "hello"} @@ -69,7 +69,7 @@ class AddWebhookTestCase(BaseTestCase): self.assertRedirects(r, "/integrations/") c = Channel.objects.get() - self.assertEqual(c.value, '{"url_down": "http://foo.com", "url_up": "", "post_data": "hello", "headers": ""}') + self.assertEqual(c.value, '{"headers": "", "post_data": "hello", "url_down": "http://foo.com", "url_up": ""}') def test_it_adds_headers(self): form = {"url_down": "http://foo.com", "headers": '{"test": "123"}'} @@ -79,5 +79,5 @@ class AddWebhookTestCase(BaseTestCase): self.assertRedirects(r, "/integrations/") c = Channel.objects.get() - self.assertEqual(c.value, '{"url_down": "http://foo.com", "url_up": "", "post_data": "", "headers": "{\\\"test\\\": \\\"123\\\"}"}') + self.assertEqual(c.value, '{"headers": "{\\\"test\\\": \\\"123\\\"}", "post_data": "", "url_down": "http://foo.com", "url_up": ""}')