From 1e66ef17fba411bb93666e80ab62042824d7fccc Mon Sep 17 00:00:00 2001 From: Julen Landa Alustiza Date: Jan 10 2020 11:25:08 +0000 Subject: tests: move project tags test to project tests file --- diff --git a/tests/test_pagure_flask_api.py b/tests/test_pagure_flask_api.py index a765e5f..a08ed1f 100644 --- a/tests/test_pagure_flask_api.py +++ b/tests/test_pagure_flask_api.py @@ -87,69 +87,6 @@ class PagureFlaskApitests(tests.SimplePagureTest): self.assertEqual(data["version"], pagure.__api_version__) self.assertEqual(sorted(data.keys()), ["version"]) - def test_api_project_tags(self): - """ Test the api_project_tags function. """ - tests.create_projects(self.session) - - output = self.app.get("/api/0/foo/tags/") - self.assertEqual(output.status_code, 404) - expected_rv = { - "error": "Project not found", - "error_code": "ENOPROJECT", - } - data = json.loads(output.get_data(as_text=True)) - self.assertDictEqual(data, expected_rv) - - output = self.app.get("/api/0/test/tags/") - self.assertEqual(output.status_code, 200) - data = json.loads(output.get_data(as_text=True)) - 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( - id=1, - uid="foobar", - project_id=1, - title="issue", - content="a bug report", - user_id=1, # pingou - ) - self.session.add(item) - self.session.commit() - item = pagure.lib.model.TagColored( - tag="tag1", tag_color="DeepBlueSky", project_id=1 - ) - self.session.add(item) - self.session.commit() - item = pagure.lib.model.TagIssueColored( - issue_uid="foobar", tag_id=item.id - ) - self.session.add(item) - self.session.commit() - - output = self.app.get("/api/0/test/tags/") - self.assertEqual(output.status_code, 200) - data = json.loads(output.get_data(as_text=True)) - 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.get_data(as_text=True)) - 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.get_data(as_text=True)) - 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. """ diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index e522b32..93a59dc 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -49,6 +49,69 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.gga_patcher.stop() super(PagureFlaskApiProjecttests, self).tearDown() + def test_api_project_tags(self): + """ Test the api_project_tags function. """ + tests.create_projects(self.session) + + output = self.app.get("/api/0/foo/tags/") + self.assertEqual(output.status_code, 404) + expected_rv = { + "error": "Project not found", + "error_code": "ENOPROJECT", + } + data = json.loads(output.get_data(as_text=True)) + self.assertDictEqual(data, expected_rv) + + output = self.app.get("/api/0/test/tags/") + self.assertEqual(output.status_code, 200) + data = json.loads(output.get_data(as_text=True)) + 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( + id=1, + uid="foobar", + project_id=1, + title="issue", + content="a bug report", + user_id=1, # pingou + ) + self.session.add(item) + self.session.commit() + item = pagure.lib.model.TagColored( + tag="tag1", tag_color="DeepBlueSky", project_id=1 + ) + self.session.add(item) + self.session.commit() + item = pagure.lib.model.TagIssueColored( + issue_uid="foobar", tag_id=item.id + ) + self.session.add(item) + self.session.commit() + + output = self.app.get("/api/0/test/tags/") + self.assertEqual(output.status_code, 200) + data = json.loads(output.get_data(as_text=True)) + 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.get_data(as_text=True)) + 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.get_data(as_text=True)) + self.assertEqual(sorted(data.keys()), ["tags", "total_tags"]) + self.assertEqual(data["tags"], []) + self.assertEqual(data["total_tags"], 0) + def test_api_git_tags(self): """ Test the api_git_tags method of the flask api. """ tests.create_projects(self.session)