From 0e2ba632db46425e4388767a7800a3545cdd43cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 19 Jul 2016 21:03:31 +0200 Subject: [PATCH] Add and fix some tests --- .../test_modules_resources.py | 24 +++++++++---------- .../test_resolver_resources.py | 14 +++++++++-- .../test_search_resources.py | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/tests/integration/resources_permissions/test_modules_resources.py b/tests/integration/resources_permissions/test_modules_resources.py index 34ad7369..68f552f4 100644 --- a/tests/integration/resources_permissions/test_modules_resources.py +++ b/tests/integration/resources_permissions/test_modules_resources.py @@ -211,18 +211,18 @@ def test_modules_patch(client, data): ] with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"): - patch_data = json.dumps({"att": "test"}) - results = helper_test_http_method(client, 'patch', public_url, patch_data, users) - assert results == [401, 403, 403, 403, 204] + patch_data = json.dumps({"att": "test"}) + results = helper_test_http_method(client, 'patch', public_url, patch_data, users) + assert results == [401, 403, 403, 403, 204] - patch_data = json.dumps({"att": "test"}) - results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) - assert results == [401, 403, 403, 403, 204] + patch_data = json.dumps({"att": "test"}) + results = helper_test_http_method(client, 'patch', private_url1, patch_data, users) + assert results == [401, 403, 403, 403, 204] - patch_data = json.dumps({"att": "test"}) - results = helper_test_http_method(client, 'patch', private_url2, patch_data, users) - assert results == [404, 404, 404, 403, 204] + patch_data = json.dumps({"att": "test"}) + results = helper_test_http_method(client, 'patch', private_url2, patch_data, users) + assert results == [404, 404, 404, 403, 204] - patch_data = json.dumps({"att": "test"}) - results = helper_test_http_method(client, 'patch', blocked_url, patch_data, users) - assert results == [404, 404, 404, 403, 451] + patch_data = json.dumps({"att": "test"}) + results = helper_test_http_method(client, 'patch', blocked_url, patch_data, users) + assert results == [404, 404, 404, 403, 451] diff --git a/tests/integration/resources_permissions/test_resolver_resources.py b/tests/integration/resources_permissions/test_resolver_resources.py index b8c43d04..7e98b692 100644 --- a/tests/integration/resources_permissions/test_resolver_resources.py +++ b/tests/integration/resources_permissions/test_resolver_resources.py @@ -100,6 +100,7 @@ def data(): role__project=m.private_project2, role__permissions=["view_project"]) + m.epic = f.EpicFactory(project=m.private_project2, ref=4) m.us = f.UserStoryFactory(project=m.private_project2, ref=1) m.task = f.TaskFactory(project=m.private_project2, ref=2) m.issue = f.IssueFactory(project=m.private_project2, ref=3) @@ -127,8 +128,9 @@ def test_resolver_list(client, data): assert results == [401, 403, 403, 200, 200] client.login(data.other_user) - response = client.json.get("{}?project={}&us={}&task={}&issue={}&milestone={}".format(url, + response = client.json.get("{}?project={}&epic={}&us={}&task={}&issue={}&milestone={}".format(url, data.private_project2.slug, + data.epic.ref, data.us.ref, data.task.ref, data.issue.ref, @@ -136,18 +138,26 @@ def test_resolver_list(client, data): assert response.data == {"project": data.private_project2.pk} client.login(data.project_owner) - response = client.json.get("{}?project={}&us={}&task={}&issue={}&milestone={}".format(url, + response = client.json.get("{}?project={}&epic={}&us={}&task={}&issue={}&milestone={}".format(url, data.private_project2.slug, + data.epic.ref, data.us.ref, data.task.ref, data.issue.ref, data.milestone.slug)) assert response.data == {"project": data.private_project2.pk, + "epic": data.epic.pk, "us": data.us.pk, "task": data.task.pk, "issue": data.issue.pk, "milestone": data.milestone.pk} + response = client.json.get("{}?project={}&ref={}".format(url, + data.private_project2.slug, + data.epic.ref)) + assert response.data == {"project": data.private_project2.pk, + "epic": data.epic.pk} + response = client.json.get("{}?project={}&ref={}".format(url, data.private_project2.slug, data.us.ref)) diff --git a/tests/integration/resources_permissions/test_search_resources.py b/tests/integration/resources_permissions/test_search_resources.py index 7ce732be..633b3131 100644 --- a/tests/integration/resources_permissions/test_search_resources.py +++ b/tests/integration/resources_permissions/test_search_resources.py @@ -126,7 +126,7 @@ def test_search_list(client, data): ] results = helper_test_http_method_and_keys(client, 'get', url, {'project': data.public_project.pk}, users) - all_keys = set(['count', 'userstories', 'issues', 'tasks', 'wikipages']) + all_keys = set(['count', 'userstories', 'issues', 'tasks', 'wikipages', 'epics']) assert results == [(200, all_keys), (200, all_keys), (200, all_keys), (200, all_keys), (200, all_keys)] results = helper_test_http_method_and_keys(client, 'get', url, {'project': data.private_project1.pk}, users) assert results == [(200, all_keys), (200, all_keys), (200, all_keys), (200, all_keys), (200, all_keys)]