From 22662856016149ca9d8933b366aacd1924f1a2c7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 10 2015 16:17:18 +0000 Subject: Adjust the unit-tests for the change in the API data returned --- diff --git a/tests/test_progit_flask_api.py b/tests/test_progit_flask_api.py index c54817f..6432d07 100644 --- a/tests/test_progit_flask_api.py +++ b/tests/test_progit_flask_api.py @@ -54,13 +54,15 @@ class PagureFlaskApitests(tests.Modeltests): self.assertEqual(output.status_code, 200) data = json.loads(output.data) self.assertEqual(sorted(data['users']), ['foo', 'pingou']) - self.assertEqual(data.keys(), ['users']) + self.assertEqual(sorted(data.keys()), ['total_users', 'users']) + self.assertEqual(data['total_users'], 2) output = self.app.get('/api/0/users?pattern=p') self.assertEqual(output.status_code, 200) data = json.loads(output.data) self.assertEqual(data['users'], ['pingou']) - self.assertEqual(data.keys(), ['users']) + self.assertEqual(sorted(data.keys()), ['total_users', 'users']) + self.assertEqual(data['total_users'], 1) def test_api_project_tags(self): """ Test the api_project_tags function. """ @@ -76,8 +78,9 @@ class PagureFlaskApitests(tests.Modeltests): output = self.app.get('/api/0/test/tags/') self.assertEqual(output.status_code, 200) data = json.loads(output.data) - self.assertEqual(data.keys(), ['tags']) + self.assertEqual(sorted(data.keys()), ['tags', 'total_tags']) self.assertEqual(data['tags'], []) + self.assertEqual(data['total_tags'], 0) # Add an issue and tag it so that we can list them item = pagure.lib.model.Issue( @@ -105,20 +108,23 @@ class PagureFlaskApitests(tests.Modeltests): output = self.app.get('/api/0/test/tags/') self.assertEqual(output.status_code, 200) data = json.loads(output.data) - self.assertEqual(data.keys(), ['tags']) + self.assertEqual(sorted(data.keys()), ['tags', 'total_tags']) self.assertEqual(data['tags'], ['tag1']) + self.assertEqual(data['total_tags'], 1) output = self.app.get('/api/0/test/tags/?pattern=t') self.assertEqual(output.status_code, 200) data = json.loads(output.data) - self.assertEqual(data.keys(), ['tags']) + self.assertEqual(sorted(data.keys()), ['tags', 'total_tags']) self.assertEqual(data['tags'], ['tag1']) + self.assertEqual(data['total_tags'], 1) output = self.app.get('/api/0/test/tags/?pattern=p') self.assertEqual(output.status_code, 200) data = json.loads(output.data) - self.assertEqual(data.keys(), ['tags']) + self.assertEqual(sorted(data.keys()), ['tags', 'total_tags']) self.assertEqual(data['tags'], []) + self.assertEqual(data['total_tags'], 0) def test_api_groups(self): """ Test the api_groups function. """ @@ -143,13 +149,15 @@ class PagureFlaskApitests(tests.Modeltests): self.assertEqual(output.status_code, 200) data = json.loads(output.data) self.assertEqual(data['groups'], ['group1', 'rel-eng']) - self.assertEqual(data.keys(), ['groups']) + self.assertEqual(sorted(data.keys()), ['groups', 'total_groups']) + self.assertEqual(data['total_groups'], 2) output = self.app.get('/api/0/groups?pattern=re') self.assertEqual(output.status_code, 200) data = json.loads(output.data) self.assertEqual(data['groups'], ['rel-eng']) - self.assertEqual(data.keys(), ['groups']) + self.assertEqual(sorted(data.keys()), ['groups', 'total_groups']) + self.assertEqual(data['total_groups'], 1) if __name__ == '__main__': diff --git a/tests/test_progit_flask_api_fork.py b/tests/test_progit_flask_api_fork.py index 81f7a7f..7047d18 100644 --- a/tests/test_progit_flask_api_fork.py +++ b/tests/test_progit_flask_api_fork.py @@ -99,6 +99,7 @@ class PagureFlaskApiForktests(tests.Modeltests): "author": None, "status": True }, + "total_requests": 1, "requests": [ { "assignee": None, diff --git a/tests/test_progit_flask_api_issue.py b/tests/test_progit_flask_api_issue.py index ebd6748..0c50434 100644 --- a/tests/test_progit_flask_api_issue.py +++ b/tests/test_progit_flask_api_issue.py @@ -154,6 +154,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, + "total_issues": 1, "issues": [ { "assignee": None, @@ -204,6 +205,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, + "total_issues": 1, "issues": [ { "assignee": None, @@ -257,6 +259,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, + "total_issues": 1, "issues": [ { "assignee": None, @@ -296,6 +299,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, + "total_issues": 2, "issues": [ { "assignee": None, @@ -348,6 +352,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": "Closed", "tags": [] }, + "total_issues": 0, "issues": [] } ) @@ -365,6 +370,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": "Invalid", "tags": [] }, + "total_issues": 0, "issues": [] } ) diff --git a/tests/test_progit_flask_api_project.py b/tests/test_progit_flask_api_project.py index 756178a..3a320a5 100644 --- a/tests/test_progit_flask_api_project.py +++ b/tests/test_progit_flask_api_project.py @@ -100,7 +100,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): data = json.loads(output.data) self.assertDictEqual( data, - {'tags': ['0.0.1']} + {'tags': ['0.0.1'], 'total_tags': 1} ) def test_api_projects(self): @@ -137,6 +137,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual( data, { + "total_projects": 1, "projects": [ { "date_created": "1436527638", @@ -161,6 +162,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual( data, { + "total_projects": 2, "projects": [ { "date_created": "1436527638", @@ -196,6 +198,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual( data, { + "total_projects": 1, "projects": [ { "date_created": "1436527638",