From 316f1578812f133e3ffdbd395eb18367dd4585d0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 28 2015 19:02:14 +0000
Subject: Adjust the unit-tests for the change in the issue and fork API


We now return the arguments used to filters issues/forks in their own
dict in the JSON output

---

diff --git a/tests/test_progit_flask_api_fork.py b/tests/test_progit_flask_api_fork.py
index 6b4a7ec..66eb32e 100644
--- a/tests/test_progit_flask_api_fork.py
+++ b/tests/test_progit_flask_api_fork.py
@@ -90,8 +90,11 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": True
+              },
               "requests": [
                 {
                   "assignee": None,
@@ -148,8 +151,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
                     "name": "pingou"
                   }
                 }
-              ],
-              "status": True
+              ]
             }
         )
 
@@ -396,7 +398,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         data = json.loads(output.data)
         self.assertDictEqual(
             data,
-            {"message": "Request pull canceled!"}
+            {"message": "Pull-request closed!"}
         )
 
     @patch('pagure.lib.git.merge_pull_request')
@@ -608,7 +610,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
         # Valid request
         output = self.app.post(
             '/api/0/test/pull-request/1/comment', data=data, headers=headers)
-        print output.data
         self.assertEqual(output.status_code, 200)
         data = json.loads(output.data)
         self.assertDictEqual(
diff --git a/tests/test_progit_flask_api_issue.py b/tests/test_progit_flask_api_issue.py
index 008fdcc..bab7875 100644
--- a/tests/test_progit_flask_api_issue.py
+++ b/tests/test_progit_flask_api_issue.py
@@ -149,8 +149,12 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": None,
+                "tags": []
+              },
               "issues": [
                 {
                   "assignee": None,
@@ -169,9 +173,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                     "name": "pingou"
                   }
                 }
-              ],
-              "status": None,
-              "tags": []
+              ]
             }
         )
 
@@ -197,8 +199,12 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": None,
+                "tags": []
+              },
               "issues": [
                 {
                   "assignee": None,
@@ -217,9 +223,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                     "name": "pingou"
                   }
                 }
-              ],
-              "status": None,
-              "tags": []
+              ]
             }
         )
         headers = {'Authorization': 'token aaabbbccc'}
@@ -232,8 +236,12 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": None,
+                "tags": []
+              },
               "issues": [
                 {
                   "assignee": None,
@@ -252,9 +260,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                     "name": "pingou"
                   }
                 }
-              ],
-              "status": None,
-              "tags": []
+              ]
             }
         )
 
@@ -269,8 +275,12 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": None,
+                "tags": []
+              },
               "issues": [
                 {
                   "assignee": None,
@@ -306,9 +316,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
                     "name": "pingou"
                   }
                 }
-              ],
-              "status": None,
-              "tags": []
+              ]
             }
         )
 
@@ -319,11 +327,13 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
-              "issues": [],
-              "status": "Closed",
-              "tags": []
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": "Closed",
+                "tags": []
+              },
+              "issues": []
             }
         )
 
@@ -334,11 +344,13 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         self.assertDictEqual(
             data,
             {
-              "assignee": None,
-              "author": None,
-              "issues": [],
-              "status": "Invalid",
-              "tags": []
+              "args": {
+                "assignee": None,
+                "author": None,
+                "status": "Invalid",
+                "tags": []
+              },
+              "issues": []
             }
         )