From c778f476be1622f12b7103a129760ff5362f4e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 26 Aug 2014 20:06:24 +0200 Subject: [PATCH] Improved a little some tests speed --- .../test_attachment_resources.py | 233 +++++++++--------- .../test_history_resources.py | 72 +++--- 2 files changed, 167 insertions(+), 138 deletions(-) diff --git a/tests/integration/resources_permissions/test_attachment_resources.py b/tests/integration/resources_permissions/test_attachment_resources.py index bfc6843f..9c0e14f6 100644 --- a/tests/integration/resources_permissions/test_attachment_resources.py +++ b/tests/integration/resources_permissions/test_attachment_resources.py @@ -66,43 +66,56 @@ def data(): role__project=m.private_project2, role__permissions=[]) - m.public_user_story = f.UserStoryFactory(project=m.public_project, ref=1) - m.public_task = f.TaskFactory(project=m.public_project, ref=2) - m.public_issue = f.IssueFactory(project=m.public_project, ref=3) - m.public_wiki = f.WikiPageFactory(project=m.public_project, slug=4) - - m.public_user_story_attachment = f.UserStoryAttachmentFactory(project=m.public_project, content_object=m.public_user_story) - m.public_task_attachment = f.TaskAttachmentFactory(project=m.public_project, content_object=m.public_task) - m.public_issue_attachment = f.IssueAttachmentFactory(project=m.public_project, content_object=m.public_issue) - m.public_wiki_attachment = f.WikiAttachmentFactory(project=m.public_project, content_object=m.public_wiki) - - m.private_user_story1 = f.UserStoryFactory(project=m.private_project1, ref=5) - m.private_task1 = f.TaskFactory(project=m.private_project1, ref=6) - m.private_issue1 = f.IssueFactory(project=m.private_project1, ref=7) - m.private_wiki1 = f.WikiPageFactory(project=m.private_project1, slug=8) - - m.private_user_story1_attachment = f.UserStoryAttachmentFactory(project=m.private_project1, content_object=m.private_user_story1) - m.private_task1_attachment = f.TaskAttachmentFactory(project=m.private_project1, content_object=m.private_task1) - m.private_issue1_attachment = f.IssueAttachmentFactory(project=m.private_project1, content_object=m.private_issue1) - m.private_wiki1_attachment = f.WikiAttachmentFactory(project=m.private_project1, content_object=m.private_wiki1) - - m.private_user_story2 = f.UserStoryFactory(project=m.private_project2, ref=9) - m.private_task2 = f.TaskFactory(project=m.private_project2, ref=10) - m.private_issue2 = f.IssueFactory(project=m.private_project2, ref=11) - m.private_wiki2 = f.WikiPageFactory(project=m.private_project2, slug=12) - - m.private_user_story2_attachment = f.UserStoryAttachmentFactory(project=m.private_project2, content_object=m.private_user_story2) - m.private_task2_attachment = f.TaskAttachmentFactory(project=m.private_project2, content_object=m.private_task2) - m.private_issue2_attachment = f.IssueAttachmentFactory(project=m.private_project2, content_object=m.private_issue2) - m.private_wiki2_attachment = f.WikiAttachmentFactory(project=m.private_project2, content_object=m.private_wiki2) - return m +@pytest.fixture +def data_us(data): + m = type("Models", (object,), {}) + m.public_user_story = f.UserStoryFactory(project=data.public_project, ref=1) + m.public_user_story_attachment = f.UserStoryAttachmentFactory(project=data.public_project, content_object=m.public_user_story) + m.private_user_story1 = f.UserStoryFactory(project=data.private_project1, ref=5) + m.private_user_story1_attachment = f.UserStoryAttachmentFactory(project=data.private_project1, content_object=m.private_user_story1) + m.private_user_story2 = f.UserStoryFactory(project=data.private_project2, ref=9) + m.private_user_story2_attachment = f.UserStoryAttachmentFactory(project=data.private_project2, content_object=m.private_user_story2) + return m -def test_user_story_attachment_retrieve(client, data): - public_url = reverse('userstory-attachments-detail', kwargs={"pk": data.public_user_story_attachment.pk}) - private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story1_attachment.pk}) - private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story2_attachment.pk}) +@pytest.fixture +def data_task(data): + m = type("Models", (object,), {}) + m.public_task = f.TaskFactory(project=data.public_project, ref=2) + m.public_task_attachment = f.TaskAttachmentFactory(project=data.public_project, content_object=m.public_task) + m.private_task1 = f.TaskFactory(project=data.private_project1, ref=6) + m.private_task1_attachment = f.TaskAttachmentFactory(project=data.private_project1, content_object=m.private_task1) + m.private_task2 = f.TaskFactory(project=data.private_project2, ref=10) + m.private_task2_attachment = f.TaskAttachmentFactory(project=data.private_project2, content_object=m.private_task2) + return m + +@pytest.fixture +def data_issue(data): + m = type("Models", (object,), {}) + m.public_issue = f.IssueFactory(project=data.public_project, ref=3) + m.public_issue_attachment = f.IssueAttachmentFactory(project=data.public_project, content_object=m.public_issue) + m.private_issue1 = f.IssueFactory(project=data.private_project1, ref=7) + m.private_issue1_attachment = f.IssueAttachmentFactory(project=data.private_project1, content_object=m.private_issue1) + m.private_issue2 = f.IssueFactory(project=data.private_project2, ref=11) + m.private_issue2_attachment = f.IssueAttachmentFactory(project=data.private_project2, content_object=m.private_issue2) + return m + +@pytest.fixture +def data_wiki(data): + m = type("Models", (object,), {}) + m.public_wiki = f.WikiPageFactory(project=data.public_project, slug=4) + m.public_wiki_attachment = f.WikiAttachmentFactory(project=data.public_project, content_object=m.public_wiki) + m.private_wiki1 = f.WikiPageFactory(project=data.private_project1, slug=8) + m.private_wiki1_attachment = f.WikiAttachmentFactory(project=data.private_project1, content_object=m.private_wiki1) + m.private_wiki2 = f.WikiPageFactory(project=data.private_project2, slug=12) + m.private_wiki2_attachment = f.WikiAttachmentFactory(project=data.private_project2, content_object=m.private_wiki2) + return m + +def test_user_story_attachment_retrieve(client, data, data_us): + public_url = reverse('userstory-attachments-detail', kwargs={"pk": data_us.public_user_story_attachment.pk}) + private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story1_attachment.pk}) + private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story2_attachment.pk}) users = [ None, @@ -120,10 +133,10 @@ def test_user_story_attachment_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_task_attachment_retrieve(client, data): - public_url = reverse('task-attachments-detail', kwargs={"pk": data.public_task_attachment.pk}) - private_url1 = reverse('task-attachments-detail', kwargs={"pk": data.private_task1_attachment.pk}) - private_url2 = reverse('task-attachments-detail', kwargs={"pk": data.private_task2_attachment.pk}) +def test_task_attachment_retrieve(client, data, data_task): + public_url = reverse('task-attachments-detail', kwargs={"pk": data_task.public_task_attachment.pk}) + private_url1 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task1_attachment.pk}) + private_url2 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task2_attachment.pk}) users = [ None, @@ -141,10 +154,10 @@ def test_task_attachment_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_issue_attachment_retrieve(client, data): - public_url = reverse('issue-attachments-detail', kwargs={"pk": data.public_issue_attachment.pk}) - private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue1_attachment.pk}) - private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue2_attachment.pk}) +def test_issue_attachment_retrieve(client, data, data_issue): + public_url = reverse('issue-attachments-detail', kwargs={"pk": data_issue.public_issue_attachment.pk}) + private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue1_attachment.pk}) + private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue2_attachment.pk}) users = [ None, @@ -162,10 +175,10 @@ def test_issue_attachment_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_wiki_attachment_retrieve(client, data): - public_url = reverse('wiki-attachments-detail', kwargs={"pk": data.public_wiki_attachment.pk}) - private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki1_attachment.pk}) - private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki2_attachment.pk}) +def test_wiki_attachment_retrieve(client, data, data_wiki): + public_url = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.public_wiki_attachment.pk}) + private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki1_attachment.pk}) + private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki2_attachment.pk}) users = [ None, @@ -183,10 +196,10 @@ def test_wiki_attachment_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_user_story_attachment_update(client, data): - public_url = reverse('userstory-attachments-detail', kwargs={"pk": data.public_user_story_attachment.pk}) - private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story1_attachment.pk}) - private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story2_attachment.pk}) +def test_user_story_attachment_update(client, data, data_us): + public_url = reverse('userstory-attachments-detail', kwargs={"pk": data_us.public_user_story_attachment.pk}) + private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story1_attachment.pk}) + private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story2_attachment.pk}) users = [ None, @@ -196,7 +209,7 @@ def test_user_story_attachment_update(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_user_story_attachment).data + attachment_data = AttachmentSerializer(data_us.public_user_story_attachment).data attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -208,10 +221,10 @@ def test_user_story_attachment_update(client, data): assert results == [401, 403, 403, 200, 200] -def test_task_attachment_update(client, data): - public_url = reverse('task-attachments-detail', kwargs={"pk": data.public_task_attachment.pk}) - private_url1 = reverse('task-attachments-detail', kwargs={"pk": data.private_task1_attachment.pk}) - private_url2 = reverse('task-attachments-detail', kwargs={"pk": data.private_task2_attachment.pk}) +def test_task_attachment_update(client, data, data_task): + public_url = reverse('task-attachments-detail', kwargs={"pk": data_task.public_task_attachment.pk}) + private_url1 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task1_attachment.pk}) + private_url2 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task2_attachment.pk}) users = [ None, @@ -221,7 +234,7 @@ def test_task_attachment_update(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_task_attachment).data + attachment_data = AttachmentSerializer(data_task.public_task_attachment).data attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -233,10 +246,10 @@ def test_task_attachment_update(client, data): assert results == [401, 403, 403, 200, 200] -def test_issue_attachment_update(client, data): - public_url = reverse('issue-attachments-detail', kwargs={"pk": data.public_issue_attachment.pk}) - private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue1_attachment.pk}) - private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue2_attachment.pk}) +def test_issue_attachment_update(client, data, data_issue): + public_url = reverse('issue-attachments-detail', kwargs={"pk": data_issue.public_issue_attachment.pk}) + private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue1_attachment.pk}) + private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue2_attachment.pk}) users = [ None, @@ -246,7 +259,7 @@ def test_issue_attachment_update(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_issue_attachment).data + attachment_data = AttachmentSerializer(data_issue.public_issue_attachment).data attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -258,10 +271,10 @@ def test_issue_attachment_update(client, data): assert results == [401, 403, 403, 200, 200] -def test_wiki_attachment_update(client, data): - public_url = reverse('wiki-attachments-detail', kwargs={"pk": data.public_wiki_attachment.pk}) - private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki1_attachment.pk}) - private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki2_attachment.pk}) +def test_wiki_attachment_update(client, data, data_wiki): + public_url = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.public_wiki_attachment.pk}) + private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki1_attachment.pk}) + private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki2_attachment.pk}) users = [ None, @@ -271,7 +284,7 @@ def test_wiki_attachment_update(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_wiki_attachment).data + attachment_data = AttachmentSerializer(data_wiki.public_wiki_attachment).data attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -283,10 +296,10 @@ def test_wiki_attachment_update(client, data): assert results == [401, 403, 403, 200, 200] -def test_user_story_attachment_patch(client, data): - public_url = reverse('userstory-attachments-detail', kwargs={"pk": data.public_user_story_attachment.pk}) - private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story1_attachment.pk}) - private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story2_attachment.pk}) +def test_user_story_attachment_patch(client, data, data_us): + public_url = reverse('userstory-attachments-detail', kwargs={"pk": data_us.public_user_story_attachment.pk}) + private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story1_attachment.pk}) + private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story2_attachment.pk}) users = [ None, @@ -307,10 +320,10 @@ def test_user_story_attachment_patch(client, data): assert results == [401, 403, 403, 200, 200] -def test_task_attachment_patch(client, data): - public_url = reverse('task-attachments-detail', kwargs={"pk": data.public_task_attachment.pk}) - private_url1 = reverse('task-attachments-detail', kwargs={"pk": data.private_task1_attachment.pk}) - private_url2 = reverse('task-attachments-detail', kwargs={"pk": data.private_task2_attachment.pk}) +def test_task_attachment_patch(client, data, data_task): + public_url = reverse('task-attachments-detail', kwargs={"pk": data_task.public_task_attachment.pk}) + private_url1 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task1_attachment.pk}) + private_url2 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task2_attachment.pk}) users = [ None, @@ -331,10 +344,10 @@ def test_task_attachment_patch(client, data): assert results == [401, 403, 403, 200, 200] -def test_issue_attachment_patch(client, data): - public_url = reverse('issue-attachments-detail', kwargs={"pk": data.public_issue_attachment.pk}) - private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue1_attachment.pk}) - private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue2_attachment.pk}) +def test_issue_attachment_patch(client, data, data_issue): + public_url = reverse('issue-attachments-detail', kwargs={"pk": data_issue.public_issue_attachment.pk}) + private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue1_attachment.pk}) + private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue2_attachment.pk}) users = [ None, @@ -355,10 +368,10 @@ def test_issue_attachment_patch(client, data): assert results == [401, 403, 403, 200, 200] -def test_wiki_attachment_patch(client, data): - public_url = reverse('wiki-attachments-detail', kwargs={"pk": data.public_wiki_attachment.pk}) - private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki1_attachment.pk}) - private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki2_attachment.pk}) +def test_wiki_attachment_patch(client, data, data_wiki): + public_url = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.public_wiki_attachment.pk}) + private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki1_attachment.pk}) + private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki2_attachment.pk}) users = [ None, @@ -379,10 +392,10 @@ def test_wiki_attachment_patch(client, data): assert results == [401, 403, 403, 200, 200] -def test_user_story_attachment_delete(client, data): - public_url = reverse('userstory-attachments-detail', kwargs={"pk": data.public_user_story_attachment.pk}) - private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story1_attachment.pk}) - private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data.private_user_story2_attachment.pk}) +def test_user_story_attachment_delete(client, data, data_us): + public_url = reverse('userstory-attachments-detail', kwargs={"pk": data_us.public_user_story_attachment.pk}) + private_url1 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story1_attachment.pk}) + private_url2 = reverse('userstory-attachments-detail', kwargs={"pk": data_us.private_user_story2_attachment.pk}) users = [ None, @@ -399,10 +412,10 @@ def test_user_story_attachment_delete(client, data): assert results == [401, 403, 403, 204] -def test_task_attachment_delete(client, data): - public_url = reverse('task-attachments-detail', kwargs={"pk": data.public_task_attachment.pk}) - private_url1 = reverse('task-attachments-detail', kwargs={"pk": data.private_task1_attachment.pk}) - private_url2 = reverse('task-attachments-detail', kwargs={"pk": data.private_task2_attachment.pk}) +def test_task_attachment_delete(client, data, data_task): + public_url = reverse('task-attachments-detail', kwargs={"pk": data_task.public_task_attachment.pk}) + private_url1 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task1_attachment.pk}) + private_url2 = reverse('task-attachments-detail', kwargs={"pk": data_task.private_task2_attachment.pk}) users = [ None, @@ -419,10 +432,10 @@ def test_task_attachment_delete(client, data): assert results == [401, 403, 403, 204] -def test_issue_attachment_delete(client, data): - public_url = reverse('issue-attachments-detail', kwargs={"pk": data.public_issue_attachment.pk}) - private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue1_attachment.pk}) - private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data.private_issue2_attachment.pk}) +def test_issue_attachment_delete(client, data, data_issue): + public_url = reverse('issue-attachments-detail', kwargs={"pk": data_issue.public_issue_attachment.pk}) + private_url1 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue1_attachment.pk}) + private_url2 = reverse('issue-attachments-detail', kwargs={"pk": data_issue.private_issue2_attachment.pk}) users = [ None, @@ -439,10 +452,10 @@ def test_issue_attachment_delete(client, data): assert results == [401, 403, 403, 204] -def test_wiki_attachment_delete(client, data): - public_url = reverse('wiki-attachments-detail', kwargs={"pk": data.public_wiki_attachment.pk}) - private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki1_attachment.pk}) - private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data.private_wiki2_attachment.pk}) +def test_wiki_attachment_delete(client, data, data_wiki): + public_url = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.public_wiki_attachment.pk}) + private_url1 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki1_attachment.pk}) + private_url2 = reverse('wiki-attachments-detail', kwargs={"pk": data_wiki.private_wiki2_attachment.pk}) users = [ None, @@ -458,7 +471,7 @@ def test_wiki_attachment_delete(client, data): results = helper_test_http_method(client, 'delete', private_url2, None, users) assert results == [401, 403, 403, 204] -def test_user_story_attachment_create(client, data): +def test_user_story_attachment_create(client, data, data_us): url = reverse('userstory-attachments-list') users = [ @@ -469,7 +482,7 @@ def test_user_story_attachment_create(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_user_story_attachment).data + attachment_data = AttachmentSerializer(data_us.public_user_story_attachment).data attachment_data["id"] = None attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -477,7 +490,7 @@ def test_user_story_attachment_create(client, data): assert results == [401, 403, 403, 201, 201] -def test_task_attachment_create(client, data): +def test_task_attachment_create(client, data, data_task): url = reverse('task-attachments-list') users = [ @@ -488,7 +501,7 @@ def test_task_attachment_create(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_task_attachment).data + attachment_data = AttachmentSerializer(data_task.public_task_attachment).data attachment_data["id"] = None attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -496,7 +509,7 @@ def test_task_attachment_create(client, data): assert results == [401, 403, 403, 201, 201] -def test_issue_attachment_create(client, data): +def test_issue_attachment_create(client, data, data_issue): url = reverse('issue-attachments-list') users = [ @@ -507,7 +520,7 @@ def test_issue_attachment_create(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_issue_attachment).data + attachment_data = AttachmentSerializer(data_issue.public_issue_attachment).data attachment_data["id"] = None attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -515,7 +528,7 @@ def test_issue_attachment_create(client, data): assert results == [401, 403, 403, 201, 201] -def test_wiki_attachment_create(client, data): +def test_wiki_attachment_create(client, data, data_wiki): url = reverse('wiki-attachments-list') users = [ @@ -526,7 +539,7 @@ def test_wiki_attachment_create(client, data): data.project_owner ] - attachment_data = AttachmentSerializer(data.public_wiki_attachment).data + attachment_data = AttachmentSerializer(data_wiki.public_wiki_attachment).data attachment_data["id"] = None attachment_data["description"] = "test" attachment_data = JSONRenderer().render(attachment_data) @@ -534,7 +547,7 @@ def test_wiki_attachment_create(client, data): assert results == [401, 201, 201, 201, 201] -def test_user_story_attachment_list(client, data): +def test_user_story_attachment_list(client, data, data_us): url = reverse('userstory-attachments-list') users = [ @@ -549,7 +562,7 @@ def test_user_story_attachment_list(client, data): assert results == [(200, 2), (200, 2), (200, 2), (200, 3), (200, 3)] -def test_task_attachment_list(client, data): +def test_task_attachment_list(client, data, data_task): url = reverse('task-attachments-list') users = [ @@ -564,7 +577,7 @@ def test_task_attachment_list(client, data): assert results == [(200, 2), (200, 2), (200, 2), (200, 3), (200, 3)] -def test_issue_attachment_list(client, data): +def test_issue_attachment_list(client, data, data_issue): url = reverse('issue-attachments-list') users = [ @@ -579,7 +592,7 @@ def test_issue_attachment_list(client, data): assert results == [(200, 2), (200, 2), (200, 2), (200, 3), (200, 3)] -def test_wiki_attachment_list(client, data): +def test_wiki_attachment_list(client, data, data_wiki): url = reverse('wiki-attachments-list') users = [ diff --git a/tests/integration/resources_permissions/test_history_resources.py b/tests/integration/resources_permissions/test_history_resources.py index 0313eabc..81932926 100644 --- a/tests/integration/resources_permissions/test_history_resources.py +++ b/tests/integration/resources_permissions/test_history_resources.py @@ -64,29 +64,45 @@ def data(): user=m.project_member_without_perms, role__project=m.private_project2, role__permissions=[]) + return m - m.public_user_story = f.UserStoryFactory(project=m.public_project, ref=1) - m.public_task = f.TaskFactory(project=m.public_project, ref=2) - m.public_issue = f.IssueFactory(project=m.public_project, ref=3) - m.public_wiki = f.WikiPageFactory(project=m.public_project, slug=4) +@pytest.fixture +def data_us(data): + m = type("Models", (object,), {}) + m.public_user_story = f.UserStoryFactory(project=data.public_project, ref=1) + m.private_user_story1 = f.UserStoryFactory(project=data.private_project1, ref=5) + m.private_user_story2 = f.UserStoryFactory(project=data.private_project2, ref=9) + return m - m.private_user_story1 = f.UserStoryFactory(project=m.private_project1, ref=5) - m.private_task1 = f.TaskFactory(project=m.private_project1, ref=6) - m.private_issue1 = f.IssueFactory(project=m.private_project1, ref=7) - m.private_wiki1 = f.WikiPageFactory(project=m.private_project1, slug=8) +@pytest.fixture +def data_task(data): + m = type("Models", (object,), {}) + m.public_task = f.TaskFactory(project=data.public_project, ref=2) + m.private_task1 = f.TaskFactory(project=data.private_project1, ref=6) + m.private_task2 = f.TaskFactory(project=data.private_project2, ref=10) + return m - m.private_user_story2 = f.UserStoryFactory(project=m.private_project2, ref=9) - m.private_task2 = f.TaskFactory(project=m.private_project2, ref=10) - m.private_issue2 = f.IssueFactory(project=m.private_project2, ref=11) - m.private_wiki2 = f.WikiPageFactory(project=m.private_project2, slug=12) +@pytest.fixture +def data_issue(data): + m = type("Models", (object,), {}) + m.public_issue = f.IssueFactory(project=data.public_project, ref=3) + m.private_issue1 = f.IssueFactory(project=data.private_project1, ref=7) + m.private_issue2 = f.IssueFactory(project=data.private_project2, ref=11) + return m +@pytest.fixture +def data_wiki(data): + m = type("Models", (object,), {}) + m.public_wiki = f.WikiPageFactory(project=data.public_project, slug=4) + m.private_wiki1 = f.WikiPageFactory(project=data.private_project1, slug=8) + m.private_wiki2 = f.WikiPageFactory(project=data.private_project2, slug=12) return m -def test_user_story_history_retrieve(client, data): - public_url = reverse('userstory-history-detail', kwargs={"pk": data.public_user_story.pk}) - private_url1 = reverse('userstory-history-detail', kwargs={"pk": data.private_user_story1.pk}) - private_url2 = reverse('userstory-history-detail', kwargs={"pk": data.private_user_story2.pk}) +def test_user_story_history_retrieve(client, data, data_us): + public_url = reverse('userstory-history-detail', kwargs={"pk": data_us.public_user_story.pk}) + private_url1 = reverse('userstory-history-detail', kwargs={"pk": data_us.private_user_story1.pk}) + private_url2 = reverse('userstory-history-detail', kwargs={"pk": data_us.private_user_story2.pk}) users = [ None, @@ -104,10 +120,10 @@ def test_user_story_history_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_task_history_retrieve(client, data): - public_url = reverse('task-history-detail', kwargs={"pk": data.public_task.pk}) - private_url1 = reverse('task-history-detail', kwargs={"pk": data.private_task1.pk}) - private_url2 = reverse('task-history-detail', kwargs={"pk": data.private_task2.pk}) +def test_task_history_retrieve(client, data, data_task): + public_url = reverse('task-history-detail', kwargs={"pk": data_task.public_task.pk}) + private_url1 = reverse('task-history-detail', kwargs={"pk": data_task.private_task1.pk}) + private_url2 = reverse('task-history-detail', kwargs={"pk": data_task.private_task2.pk}) users = [ None, @@ -125,10 +141,10 @@ def test_task_history_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_issue_history_retrieve(client, data): - public_url = reverse('issue-history-detail', kwargs={"pk": data.public_issue.pk}) - private_url1 = reverse('issue-history-detail', kwargs={"pk": data.private_issue1.pk}) - private_url2 = reverse('issue-history-detail', kwargs={"pk": data.private_issue2.pk}) +def test_issue_history_retrieve(client, data, data_issue): + public_url = reverse('issue-history-detail', kwargs={"pk": data_issue.public_issue.pk}) + private_url1 = reverse('issue-history-detail', kwargs={"pk": data_issue.private_issue1.pk}) + private_url2 = reverse('issue-history-detail', kwargs={"pk": data_issue.private_issue2.pk}) users = [ None, @@ -146,10 +162,10 @@ def test_issue_history_retrieve(client, data): assert results == [401, 403, 403, 200, 200] -def test_wiki_history_retrieve(client, data): - public_url = reverse('wiki-history-detail', kwargs={"pk": data.public_wiki.pk}) - private_url1 = reverse('wiki-history-detail', kwargs={"pk": data.private_wiki1.pk}) - private_url2 = reverse('wiki-history-detail', kwargs={"pk": data.private_wiki2.pk}) +def test_wiki_history_retrieve(client, data, data_wiki): + public_url = reverse('wiki-history-detail', kwargs={"pk": data_wiki.public_wiki.pk}) + private_url1 = reverse('wiki-history-detail', kwargs={"pk": data_wiki.private_wiki1.pk}) + private_url2 = reverse('wiki-history-detail', kwargs={"pk": data_wiki.private_wiki2.pk}) users = [ None,