From 91b570aca8952ce4a00601adcc1babdeb5576159 Mon Sep 17 00:00:00 2001
From: John Pellman <pellman.john@gmail.com>
Date: Wed, 11 Jul 2018 16:24:17 -0400
Subject: [PATCH] jira: Fix JSON post requests for create and edit commands.

---
 zulip_bots/zulip_bots/bots/jira/fixtures/test_create.json | 5 ++---
 .../zulip_bots/bots/jira/fixtures/test_create_error.json  | 5 ++---
 zulip_bots/zulip_bots/bots/jira/fixtures/test_edit.json   | 5 ++---
 .../zulip_bots/bots/jira/fixtures/test_edit_error.json    | 5 ++---
 zulip_bots/zulip_bots/bots/jira/jira.py                   | 8 ++++----
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/zulip_bots/zulip_bots/bots/jira/fixtures/test_create.json b/zulip_bots/zulip_bots/bots/jira/fixtures/test_create.json
index 12e60bb..ca0be32 100644
--- a/zulip_bots/zulip_bots/bots/jira/fixtures/test_create.json
+++ b/zulip_bots/zulip_bots/bots/jira/fixtures/test_create.json
@@ -3,10 +3,9 @@
     "api_url": "https://example.atlassian.net/rest/api/2/issue",
     "method": "POST",
     "headers": {
-      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz",
-      "Content-type": "application/json"
+      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz"
     },
-    "data": {
+    "json": {
       "fields": {
         "summary": "Testing",
         "project": { 
diff --git a/zulip_bots/zulip_bots/bots/jira/fixtures/test_create_error.json b/zulip_bots/zulip_bots/bots/jira/fixtures/test_create_error.json
index d49df11..723f749 100644
--- a/zulip_bots/zulip_bots/bots/jira/fixtures/test_create_error.json
+++ b/zulip_bots/zulip_bots/bots/jira/fixtures/test_create_error.json
@@ -3,10 +3,9 @@
     "api_url": "https://example.atlassian.net/rest/api/2/issue",
     "method": "POST",
     "headers": {
-      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz",
-      "Content-type": "application/json"
+      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz"
     },
-    "data": {
+    "json": {
       "fields": {
         "summary": "Testing",
         "project": { 
diff --git a/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit.json b/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit.json
index 0ca6656..e6d6818 100644
--- a/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit.json
+++ b/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit.json
@@ -3,10 +3,9 @@
     "api_url": "https://example.atlassian.net/rest/api/2/issue/TEST-16",
     "method": "PUT",
     "headers": {
-      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz",
-      "Content-type": "application/json"
+      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz"
     },
-    "data": {
+    "json": {
       "fields": {
         "description": "description"
       }
diff --git a/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit_error.json b/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit_error.json
index 9b8c58e..ad3f501 100644
--- a/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit_error.json
+++ b/zulip_bots/zulip_bots/bots/jira/fixtures/test_edit_error.json
@@ -3,10 +3,9 @@
     "api_url": "https://example.atlassian.net/rest/api/2/issue/TEST-13",
     "method": "PUT",
     "headers": {
-      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz",
-      "Content-type": "application/json"
+      "Authorization": "Basic ZXhhbXBsZUBleGFtcGxlLmNvbTpxd2VydHkhMTIz"
     },
-    "data": {
+    "json": {
       "fields": {
         "summary": "Change the summary",
         "project": { 
diff --git a/zulip_bots/zulip_bots/bots/jira/jira.py b/zulip_bots/zulip_bots/bots/jira/jira.py
index 1a8438b..d877522 100644
--- a/zulip_bots/zulip_bots/bots/jira/jira.py
+++ b/zulip_bots/zulip_bots/bots/jira/jira.py
@@ -177,8 +177,8 @@ class JiraHandler(object):
         elif create_match:
             jira_response = requests.post(
                 self.domain_with_protocol + '/rest/api/2/issue',
-                headers={'Authorization': self.auth, 'Content-type': 'application/json'},
-                data=make_create_json(create_match.group('summary'),
+                headers={'Authorization': self.auth},
+                json=make_create_json(create_match.group('summary'),
                                       create_match.group('project_key'),
                                       create_match.group('type_name'),
                                       create_match.group('description'),
@@ -202,8 +202,8 @@ class JiraHandler(object):
 
             jira_response = requests.put(
                 self.domain_with_protocol + '/rest/api/2/issue/' + key,
-                headers={'Authorization': self.auth, 'Content-type': 'application/json'},
-                data=make_edit_json(edit_match.group('summary'),
+                headers={'Authorization': self.auth},
+                json=make_edit_json(edit_match.group('summary'),
                                     edit_match.group('project_key'),
                                     edit_match.group('type_name'),
                                     edit_match.group('description'),