From 0b375be614f4e748634a646dbfd1ad24eead4229 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 6 Sep 2014 01:55:25 +0200 Subject: [PATCH] Replace direct JSONRender usage with taiga own json module on all tests. So unify the json interface in all tests code. --- taiga/base/utils/json.py | 9 ++- .../test_attachment_resources.py | 17 ++-- .../test_auth_resources.py | 9 +-- .../test_history_resources.py | 6 +- .../test_issues_resources.py | 22 ++--- .../test_milestones_resources.py | 14 ++-- .../test_projects_choices_resources.py | 81 +++++++++---------- .../test_projects_resource.py | 9 +-- .../test_resolver_resources.py | 7 +- .../test_search_resources.py | 7 +- .../test_storage_resources.py | 18 ++--- .../test_tasks_resources.py | 13 ++- .../test_timelines_resources.py | 6 +- .../test_users_resources.py | 13 ++- .../test_userstories_resources.py | 13 ++- .../test_wiki_resources.py | 20 ++--- tests/integration/test_attachments.py | 2 - tests/integration/test_issues.py | 2 +- tests/integration/test_memberships.py | 4 +- tests/integration/test_projects.py | 4 +- tests/integration/test_tasks.py | 4 +- tests/integration/test_userstories.py | 4 +- 22 files changed, 119 insertions(+), 165 deletions(-) diff --git a/taiga/base/utils/json.py b/taiga/base/utils/json.py index 80bb0bc6..dcb818a3 100644 --- a/taiga/base/utils/json.py +++ b/taiga/base/utils/json.py @@ -18,9 +18,14 @@ import json from rest_framework.utils import encoders -def to_json(data, ensure_ascii=True, encoder_class=encoders.JSONEncoder): +def dumps(data, ensure_ascii=True, encoder_class=encoders.JSONEncoder): return json.dumps(data, cls=encoder_class, indent=None, ensure_ascii=ensure_ascii) -def from_json(data): +def loads(data): return json.loads(data) + +# Some backward compatibility that should +# be removed in near future. +to_json = dumps +from_json = loads diff --git a/tests/integration/resources_permissions/test_attachment_resources.py b/tests/integration/resources_permissions/test_attachment_resources.py index a809d7cc..2bdf2e2f 100644 --- a/tests/integration/resources_permissions/test_attachment_resources.py +++ b/tests/integration/resources_permissions/test_attachment_resources.py @@ -2,7 +2,6 @@ from django.core.urlresolvers import reverse from django.core.files.uploadedfile import SimpleUploadedFile from django.test.client import MULTIPART_CONTENT -from rest_framework.renderers import JSONRenderer from taiga.base.utils import json from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS @@ -222,7 +221,7 @@ def test_user_story_attachment_update(client, data, data_us): attachment_data = AttachmentSerializer(data_us.public_user_story_attachment).data attachment_data["description"] = "test" - attachment_data = json.to_json(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, "put", public_url, attachment_data, users) # assert results == [401, 403, 403, 400, 400] @@ -252,7 +251,7 @@ def test_task_attachment_update(client, data, data_task): attachment_data = AttachmentSerializer(data_task.public_task_attachment).data attachment_data["description"] = "test" - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'put', public_url, attachment_data, users) assert results == [405, 405, 405, 405, 405] @@ -280,7 +279,7 @@ def test_issue_attachment_update(client, data, data_issue): attachment_data = AttachmentSerializer(data_issue.public_issue_attachment).data attachment_data["description"] = "test" - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'put', public_url, attachment_data, users) assert results == [405, 405, 405, 405, 405] @@ -308,7 +307,7 @@ def test_wiki_attachment_update(client, data, data_wiki): attachment_data = AttachmentSerializer(data_wiki.public_wiki_attachment).data attachment_data["description"] = "test" - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'put', public_url, attachment_data, users) assert results == [405, 405, 405, 405, 405] @@ -335,7 +334,7 @@ def test_user_story_attachment_patch(client, data, data_us): ] attachment_data = {"description": "test"} - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'patch', public_url, attachment_data, users) assert results == [401, 403, 403, 200, 200] @@ -359,7 +358,7 @@ def test_task_attachment_patch(client, data, data_task): ] attachment_data = {"description": "test"} - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'patch', public_url, attachment_data, users) assert results == [401, 403, 403, 200, 200] @@ -383,7 +382,7 @@ def test_issue_attachment_patch(client, data, data_issue): ] attachment_data = {"description": "test"} - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'patch', public_url, attachment_data, users) assert results == [401, 403, 403, 200, 200] @@ -407,7 +406,7 @@ def test_wiki_attachment_patch(client, data, data_wiki): ] attachment_data = {"description": "test"} - attachment_data = JSONRenderer().render(attachment_data) + attachment_data = json.dumps(attachment_data) results = helper_test_http_method(client, 'patch', public_url, attachment_data, users) assert results == [401, 200, 200, 200, 200] diff --git a/tests/integration/resources_permissions/test_auth_resources.py b/tests/integration/resources_permissions/test_auth_resources.py index 296fb964..8f51080a 100644 --- a/tests/integration/resources_permissions/test_auth_resources.py +++ b/tests/integration/resources_permissions/test_auth_resources.py @@ -1,15 +1,12 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS +from taiga.base.utils import json from tests import factories as f -from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals - -import json +from tests.utils import disconnect_signals, reconnect_signals +import pytest pytestmark = pytest.mark.django_db diff --git a/tests/integration/resources_permissions/test_history_resources.py b/tests/integration/resources_permissions/test_history_resources.py index 81932926..7cf1950c 100644 --- a/tests/integration/resources_permissions/test_history_resources.py +++ b/tests/integration/resources_permissions/test_history_resources.py @@ -1,15 +1,11 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db diff --git a/tests/integration/resources_permissions/test_issues_resources.py b/tests/integration/resources_permissions/test_issues_resources.py index b5de0869..2bf40ebf 100644 --- a/tests/integration/resources_permissions/test_issues_resources.py +++ b/tests/integration/resources_permissions/test_issues_resources.py @@ -1,17 +1,14 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - from taiga.projects.issues.serializers import IssueSerializer from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS +from taiga.base.utils import json from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals from taiga.projects.votes.services import add_vote -import json - +import pytest pytestmark = pytest.mark.django_db @@ -125,19 +122,19 @@ def test_issue_update(client, data): issue_data = IssueSerializer(data.public_issue).data issue_data["subject"] = "test" - issue_data = JSONRenderer().render(issue_data) + issue_data = json.dumps(issue_data) results = helper_test_http_method(client, 'put', public_url, issue_data, users) assert results == [401, 403, 403, 200, 200] issue_data = IssueSerializer(data.private_issue1).data issue_data["subject"] = "test" - issue_data = JSONRenderer().render(issue_data) + issue_data = json.dumps(issue_data) results = helper_test_http_method(client, 'put', private_url1, issue_data, users) assert results == [401, 403, 403, 200, 200] issue_data = IssueSerializer(data.private_issue2).data issue_data["subject"] = "test" - issue_data = JSONRenderer().render(issue_data) + issue_data = json.dumps(issue_data) results = helper_test_http_method(client, 'put', private_url2, issue_data, users) assert results == [401, 403, 403, 200, 200] @@ -295,15 +292,18 @@ def test_issue_bulk_create(client, data): ] - bulk_data = json.dumps({"bulk_issues": "test1\ntest2", "project_id": data.public_issue.project.pk}) + bulk_data = json.dumps({"bulk_issues": "test1\ntest2", + "project_id": data.public_issue.project.pk}) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 200, 200, 200, 200] - bulk_data = json.dumps({"bulk_issues": "test1\ntest2", "project_id": data.private_issue1.project.pk}) + bulk_data = json.dumps({"bulk_issues": "test1\ntest2", + "project_id": data.private_issue1.project.pk}) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 200, 200, 200, 200] - bulk_data = json.dumps({"bulk_issues": "test1\ntest2", "project_id": data.private_issue2.project.pk}) + bulk_data = json.dumps({"bulk_issues": "test1\ntest2", + "project_id": data.private_issue2.project.pk}) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 403, 403, 200, 200] diff --git a/tests/integration/resources_permissions/test_milestones_resources.py b/tests/integration/resources_permissions/test_milestones_resources.py index 6f5c1957..8c660968 100644 --- a/tests/integration/resources_permissions/test_milestones_resources.py +++ b/tests/integration/resources_permissions/test_milestones_resources.py @@ -1,8 +1,6 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects.milestones.serializers import MilestoneSerializer from taiga.projects.milestones.models import Milestone from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS @@ -10,8 +8,7 @@ from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db @@ -110,19 +107,19 @@ def test_milestone_update(client, data): milestone_data = MilestoneSerializer(data.public_milestone).data milestone_data["name"] = "test" - milestone_data = JSONRenderer().render(milestone_data) + milestone_data = json.dumps(milestone_data) results = helper_test_http_method(client, 'put', public_url, milestone_data, users) assert results == [401, 403, 403, 200, 200] milestone_data = MilestoneSerializer(data.private_milestone1).data milestone_data["name"] = "test" - milestone_data = JSONRenderer().render(milestone_data) + milestone_data = json.dumps(milestone_data) results = helper_test_http_method(client, 'put', private_url1, milestone_data, users) assert results == [401, 403, 403, 200, 200] milestone_data = MilestoneSerializer(data.private_milestone2).data milestone_data["name"] = "test" - milestone_data = JSONRenderer().render(milestone_data) + milestone_data = json.dumps(milestone_data) results = helper_test_http_method(client, 'put', private_url2, milestone_data, users) assert results == [401, 403, 403, 200, 200] @@ -240,6 +237,7 @@ def test_milestone_patch(client, data): results = helper_test_http_method(client, 'patch', private_url2, patch_data, users) assert results == [401, 403, 403, 200, 200] + def test_milestone_action_stats(client, data): public_url = reverse('milestones-stats', kwargs={"pk": data.public_milestone.pk}) private_url1 = reverse('milestones-stats', kwargs={"pk": data.private_milestone1.pk}) diff --git a/tests/integration/resources_permissions/test_projects_choices_resources.py b/tests/integration/resources_permissions/test_projects_choices_resources.py index bdf4beba..8f52124b 100644 --- a/tests/integration/resources_permissions/test_projects_choices_resources.py +++ b/tests/integration/resources_permissions/test_projects_choices_resources.py @@ -1,16 +1,13 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects import serializers from taiga.permissions.permissions import MEMBERS_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method -import json - +import pytest pytestmark = pytest.mark.django_db @@ -132,19 +129,19 @@ def test_roles_update(client, data): role_data = serializers.RoleSerializer(data.public_project.roles.all()[0]).data role_data["name"] = "test" - role_data = JSONRenderer().render(role_data) + role_data = json.dumps(role_data) results = helper_test_http_method(client, 'put', public_url, role_data, users) assert results == [401, 403, 403, 403, 200] role_data = serializers.RoleSerializer(data.private_project1.roles.all()[0]).data role_data["name"] = "test" - role_data = JSONRenderer().render(role_data) + role_data = json.dumps(role_data) results = helper_test_http_method(client, 'put', private1_url, role_data, users) assert results == [401, 403, 403, 403, 200] role_data = serializers.RoleSerializer(data.private_project2.roles.all()[0]).data role_data["name"] = "test" - role_data = JSONRenderer().render(role_data) + role_data = json.dumps(role_data) results = helper_test_http_method(client, 'put', private2_url, role_data, users) assert results == [401, 403, 403, 403, 200] @@ -260,19 +257,19 @@ def test_points_update(client, data): points_data = serializers.PointsSerializer(data.public_points).data points_data["name"] = "test" - points_data = JSONRenderer().render(points_data) + points_data = json.dumps(points_data) results = helper_test_http_method(client, 'put', public_url, points_data, users) assert results == [401, 403, 403, 403, 200] points_data = serializers.PointsSerializer(data.private_points1).data points_data["name"] = "test" - points_data = JSONRenderer().render(points_data) + points_data = json.dumps(points_data) results = helper_test_http_method(client, 'put', private1_url, points_data, users) assert results == [401, 403, 403, 403, 200] points_data = serializers.PointsSerializer(data.private_points2).data points_data["name"] = "test" - points_data = JSONRenderer().render(points_data) + points_data = json.dumps(points_data) results = helper_test_http_method(client, 'put', private2_url, points_data, users) assert results == [401, 403, 403, 403, 200] @@ -421,19 +418,19 @@ def test_user_story_status_update(client, data): user_story_status_data = serializers.UserStoryStatusSerializer(data.public_user_story_status).data user_story_status_data["name"] = "test" - user_story_status_data = JSONRenderer().render(user_story_status_data) + user_story_status_data = json.dumps(user_story_status_data) results = helper_test_http_method(client, 'put', public_url, user_story_status_data, users) assert results == [401, 403, 403, 403, 200] user_story_status_data = serializers.UserStoryStatusSerializer(data.private_user_story_status1).data user_story_status_data["name"] = "test" - user_story_status_data = JSONRenderer().render(user_story_status_data) + user_story_status_data = json.dumps(user_story_status_data) results = helper_test_http_method(client, 'put', private1_url, user_story_status_data, users) assert results == [401, 403, 403, 403, 200] user_story_status_data = serializers.UserStoryStatusSerializer(data.private_user_story_status2).data user_story_status_data["name"] = "test" - user_story_status_data = JSONRenderer().render(user_story_status_data) + user_story_status_data = json.dumps(user_story_status_data) results = helper_test_http_method(client, 'put', private2_url, user_story_status_data, users) assert results == [401, 403, 403, 403, 200] @@ -582,19 +579,19 @@ def test_task_status_update(client, data): task_status_data = serializers.TaskStatusSerializer(data.public_task_status).data task_status_data["name"] = "test" - task_status_data = JSONRenderer().render(task_status_data) + task_status_data = json.dumps(task_status_data) results = helper_test_http_method(client, 'put', public_url, task_status_data, users) assert results == [401, 403, 403, 403, 200] task_status_data = serializers.TaskStatusSerializer(data.private_task_status1).data task_status_data["name"] = "test" - task_status_data = JSONRenderer().render(task_status_data) + task_status_data = json.dumps(task_status_data) results = helper_test_http_method(client, 'put', private1_url, task_status_data, users) assert results == [401, 403, 403, 403, 200] task_status_data = serializers.TaskStatusSerializer(data.private_task_status2).data task_status_data["name"] = "test" - task_status_data = JSONRenderer().render(task_status_data) + task_status_data = json.dumps(task_status_data) results = helper_test_http_method(client, 'put', private2_url, task_status_data, users) assert results == [401, 403, 403, 403, 200] @@ -743,19 +740,19 @@ def test_issue_status_update(client, data): issue_status_data = serializers.IssueStatusSerializer(data.public_issue_status).data issue_status_data["name"] = "test" - issue_status_data = JSONRenderer().render(issue_status_data) + issue_status_data = json.dumps(issue_status_data) results = helper_test_http_method(client, 'put', public_url, issue_status_data, users) assert results == [401, 403, 403, 403, 200] issue_status_data = serializers.IssueStatusSerializer(data.private_issue_status1).data issue_status_data["name"] = "test" - issue_status_data = JSONRenderer().render(issue_status_data) + issue_status_data = json.dumps(issue_status_data) results = helper_test_http_method(client, 'put', private1_url, issue_status_data, users) assert results == [401, 403, 403, 403, 200] issue_status_data = serializers.IssueStatusSerializer(data.private_issue_status2).data issue_status_data["name"] = "test" - issue_status_data = JSONRenderer().render(issue_status_data) + issue_status_data = json.dumps(issue_status_data) results = helper_test_http_method(client, 'put', private2_url, issue_status_data, users) assert results == [401, 403, 403, 403, 200] @@ -904,19 +901,19 @@ def test_issue_type_update(client, data): issue_type_data = serializers.IssueTypeSerializer(data.public_issue_type).data issue_type_data["name"] = "test" - issue_type_data = JSONRenderer().render(issue_type_data) + issue_type_data = json.dumps(issue_type_data) results = helper_test_http_method(client, 'put', public_url, issue_type_data, users) assert results == [401, 403, 403, 403, 200] issue_type_data = serializers.IssueTypeSerializer(data.private_issue_type1).data issue_type_data["name"] = "test" - issue_type_data = JSONRenderer().render(issue_type_data) + issue_type_data = json.dumps(issue_type_data) results = helper_test_http_method(client, 'put', private1_url, issue_type_data, users) assert results == [401, 403, 403, 403, 200] issue_type_data = serializers.IssueTypeSerializer(data.private_issue_type2).data issue_type_data["name"] = "test" - issue_type_data = JSONRenderer().render(issue_type_data) + issue_type_data = json.dumps(issue_type_data) results = helper_test_http_method(client, 'put', private2_url, issue_type_data, users) assert results == [401, 403, 403, 403, 200] @@ -1065,19 +1062,19 @@ def test_priority_update(client, data): priority_data = serializers.PrioritySerializer(data.public_priority).data priority_data["name"] = "test" - priority_data = JSONRenderer().render(priority_data) + priority_data = json.dumps(priority_data) results = helper_test_http_method(client, 'put', public_url, priority_data, users) assert results == [401, 403, 403, 403, 200] priority_data = serializers.PrioritySerializer(data.private_priority1).data priority_data["name"] = "test" - priority_data = JSONRenderer().render(priority_data) + priority_data = json.dumps(priority_data) results = helper_test_http_method(client, 'put', private1_url, priority_data, users) assert results == [401, 403, 403, 403, 200] priority_data = serializers.PrioritySerializer(data.private_priority2).data priority_data["name"] = "test" - priority_data = JSONRenderer().render(priority_data) + priority_data = json.dumps(priority_data) results = helper_test_http_method(client, 'put', private2_url, priority_data, users) assert results == [401, 403, 403, 403, 200] @@ -1226,19 +1223,19 @@ def test_severity_update(client, data): severity_data = serializers.SeveritySerializer(data.public_severity).data severity_data["name"] = "test" - severity_data = JSONRenderer().render(severity_data) + severity_data = json.dumps(severity_data) results = helper_test_http_method(client, 'put', public_url, severity_data, users) assert results == [401, 403, 403, 403, 200] severity_data = serializers.SeveritySerializer(data.private_severity1).data severity_data["name"] = "test" - severity_data = JSONRenderer().render(severity_data) + severity_data = json.dumps(severity_data) results = helper_test_http_method(client, 'put', private1_url, severity_data, users) assert results == [401, 403, 403, 403, 200] severity_data = serializers.SeveritySerializer(data.private_severity2).data severity_data["name"] = "test" - severity_data = JSONRenderer().render(severity_data) + severity_data = json.dumps(severity_data) results = helper_test_http_method(client, 'put', private2_url, severity_data, users) assert results == [401, 403, 403, 403, 200] @@ -1387,19 +1384,19 @@ def test_membership_update(client, data): membership_data = serializers.MembershipSerializer(data.public_membership).data membership_data["token"] = "test" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', public_url, membership_data, users) assert results == [401, 403, 403, 403, 200] membership_data = serializers.MembershipSerializer(data.private_membership1).data membership_data["token"] = "test" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', private1_url, membership_data, users) assert results == [401, 403, 403, 403, 200] membership_data = serializers.MembershipSerializer(data.private_membership2).data membership_data["token"] = "test" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'put', private2_url, membership_data, users) assert results == [401, 403, 403, 403, 200] @@ -1492,21 +1489,21 @@ def test_membership_create(client, data): membership_data = serializers.MembershipSerializer(data.public_membership).data membership_data["id"] = None membership_data["email"] = "test1@test.com" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] membership_data = serializers.MembershipSerializer(data.private_membership1).data membership_data["id"] = None membership_data["email"] = "test2@test.com" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] membership_data = serializers.MembershipSerializer(data.private_membership2).data membership_data["id"] = None membership_data["email"] = "test3@test.com" - membership_data = JSONRenderer().render(membership_data) + membership_data = json.dumps(membership_data) results = helper_test_http_method(client, 'post', url, membership_data, users) assert results == [401, 403, 403, 403, 201] @@ -1529,7 +1526,7 @@ def test_membership_action_bulk_create(client, data): {"role_id": data.public_membership.role.pk, "email": "test2@test.com"}, ] } - bulk_data = JSONRenderer().render(bulk_data) + bulk_data = json.dumps(bulk_data) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 403, 403, 403, 200] @@ -1540,7 +1537,7 @@ def test_membership_action_bulk_create(client, data): {"role_id": data.private_membership1.role.pk, "email": "test2@test.com"}, ] } - bulk_data = JSONRenderer().render(bulk_data) + bulk_data = json.dumps(bulk_data) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 403, 403, 403, 200] @@ -1551,7 +1548,7 @@ def test_membership_action_bulk_create(client, data): {"role_id": data.private_membership2.role.pk, "email": "test2@test.com"}, ] } - bulk_data = JSONRenderer().render(bulk_data) + bulk_data = json.dumps(bulk_data) results = helper_test_http_method(client, 'post', url, bulk_data, users) assert results == [401, 403, 403, 403, 200] @@ -1607,7 +1604,7 @@ def test_project_template_update(client, data): project_template_data = serializers.ProjectTemplateSerializer(data.project_template).data project_template_data["default_owner_role"] = "test" - project_template_data = JSONRenderer().render(project_template_data) + project_template_data = json.dumps(project_template_data) results = helper_test_http_method(client, 'put', url, project_template_data, users) assert results == [401, 403, 200] @@ -1657,9 +1654,3 @@ def test_project_template_patch(client, data): results = helper_test_http_method(client, 'patch', url, '{"name": "Test"}', users) assert results == [401, 403, 200] - - -# def test_project_template_action_create_from_project(client, data): -# assert False -# -# diff --git a/tests/integration/resources_permissions/test_projects_resource.py b/tests/integration/resources_permissions/test_projects_resource.py index bc91ed74..02fbe5fd 100644 --- a/tests/integration/resources_permissions/test_projects_resource.py +++ b/tests/integration/resources_permissions/test_projects_resource.py @@ -1,17 +1,14 @@ -import pytest from django.core.urlresolvers import reverse from django.db.models.loading import get_model -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects.serializers import ProjectDetailSerializer from taiga.permissions.permissions import MEMBERS_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, helper_test_http_method_and_count -import json - +import pytest pytestmark = pytest.mark.django_db @@ -100,7 +97,7 @@ def test_project_update(client, data): project_data = ProjectDetailSerializer(data.private_project2).data project_data["is_private"] = False - project_data = JSONRenderer().render(project_data) + project_data = json.dumps(project_data) users = [ None, diff --git a/tests/integration/resources_permissions/test_resolver_resources.py b/tests/integration/resources_permissions/test_resolver_resources.py index fb744731..096c61bb 100644 --- a/tests/integration/resources_permissions/test_resolver_resources.py +++ b/tests/integration/resources_permissions/test_resolver_resources.py @@ -1,15 +1,12 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db diff --git a/tests/integration/resources_permissions/test_search_resources.py b/tests/integration/resources_permissions/test_search_resources.py index fd4f400b..0867675e 100644 --- a/tests/integration/resources_permissions/test_search_resources.py +++ b/tests/integration/resources_permissions/test_search_resources.py @@ -1,17 +1,12 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - from taiga.projects.issues.serializers import IssueSerializer from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method_and_keys, disconnect_signals, reconnect_signals -from taiga.projects.votes.services import add_vote - -import json +import pytest pytestmark = pytest.mark.django_db diff --git a/tests/integration/resources_permissions/test_storage_resources.py b/tests/integration/resources_permissions/test_storage_resources.py index 47182e8a..8f7f1f05 100644 --- a/tests/integration/resources_permissions/test_storage_resources.py +++ b/tests/integration/resources_permissions/test_storage_resources.py @@ -1,19 +1,17 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - -from taiga.userstorage.serializers import StorageEntrySerializer +from taiga.base.utils import json from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS - -from tests import factories as f -from tests.utils import helper_test_http_method, helper_test_http_method_and_count, disconnect_signals, reconnect_signals from taiga.projects.votes.services import add_vote - +from taiga.userstorage.serializers import StorageEntrySerializer from taiga.userstorage.models import StorageEntry -import json +from tests import factories as f +from tests.utils import helper_test_http_method +from tests.utils import helper_test_http_method_and_count +from tests.utils import disconnect_signals, reconnect_signals +import pytest pytestmark = pytest.mark.django_db @@ -63,7 +61,7 @@ def test_storage_update(client, data): storage_data = StorageEntrySerializer(data.storage_user1).data storage_data["key"] = "test" - storage_data = JSONRenderer().render(storage_data) + storage_data = json.dumps(storage_data) results = helper_test_http_method(client, 'put', url, storage_data, users) assert results == [401, 200, 201] diff --git a/tests/integration/resources_permissions/test_tasks_resources.py b/tests/integration/resources_permissions/test_tasks_resources.py index 8da1cafb..bc3f8768 100644 --- a/tests/integration/resources_permissions/test_tasks_resources.py +++ b/tests/integration/resources_permissions/test_tasks_resources.py @@ -1,16 +1,13 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects.tasks.serializers import TaskSerializer from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db @@ -125,19 +122,19 @@ def test_task_update(client, data): task_data = TaskSerializer(data.public_task).data task_data["subject"] = "test" - task_data = JSONRenderer().render(task_data) + task_data = json.dumps(task_data) results = helper_test_http_method(client, 'put', public_url, task_data, users) assert results == [401, 403, 403, 200, 200] task_data = TaskSerializer(data.private_task1).data task_data["subject"] = "test" - task_data = JSONRenderer().render(task_data) + task_data = json.dumps(task_data) results = helper_test_http_method(client, 'put', private_url1, task_data, users) assert results == [401, 403, 403, 200, 200] task_data = TaskSerializer(data.private_task2).data task_data["subject"] = "test" - task_data = JSONRenderer().render(task_data) + task_data = json.dumps(task_data) results = helper_test_http_method(client, 'put', private_url2, task_data, users) assert results == [401, 403, 403, 200, 200] diff --git a/tests/integration/resources_permissions/test_timelines_resources.py b/tests/integration/resources_permissions/test_timelines_resources.py index 2dbe7074..c364b0a7 100644 --- a/tests/integration/resources_permissions/test_timelines_resources.py +++ b/tests/integration/resources_permissions/test_timelines_resources.py @@ -1,15 +1,11 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db diff --git a/tests/integration/resources_permissions/test_users_resources.py b/tests/integration/resources_permissions/test_users_resources.py index 4e04f2e4..d3eea37a 100644 --- a/tests/integration/resources_permissions/test_users_resources.py +++ b/tests/integration/resources_permissions/test_users_resources.py @@ -1,17 +1,14 @@ -import pytest +from tempfile import NamedTemporaryFile + from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.users.serializers import UserSerializer from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - -from tempfile import NamedTemporaryFile - +import pytest pytestmark = pytest.mark.django_db DUMMY_BMP_DATA = b'BM:\x00\x00\x00\x00\x00\x00\x006\x00\x00\x00(\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x18\x00\x00\x00\x00\x00\x04\x00\x00\x00\x13\x0b\x00\x00\x13\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' @@ -62,7 +59,7 @@ def test_user_update(client, data): user_data = UserSerializer(data.registered_user).data user_data["full_name"] = "test" - user_data = JSONRenderer().render(user_data) + user_data = json.dumps(user_data) results = helper_test_http_method(client, 'put', url, user_data, users) assert results == [401, 200, 403, 200] diff --git a/tests/integration/resources_permissions/test_userstories_resources.py b/tests/integration/resources_permissions/test_userstories_resources.py index 4da129df..7be4958b 100644 --- a/tests/integration/resources_permissions/test_userstories_resources.py +++ b/tests/integration/resources_permissions/test_userstories_resources.py @@ -1,16 +1,13 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects.userstories.serializers import UserStorySerializer from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -import json - +import pytest pytestmark = pytest.mark.django_db @@ -123,19 +120,19 @@ def test_user_story_update(client, data): user_story_data = UserStorySerializer(data.public_user_story).data user_story_data["subject"] = "test" - user_story_data = JSONRenderer().render(user_story_data) + user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', public_url, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story1).data user_story_data["subject"] = "test" - user_story_data = JSONRenderer().render(user_story_data) + user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url1, user_story_data, users) assert results == [401, 403, 403, 200, 200] user_story_data = UserStorySerializer(data.private_user_story2).data user_story_data["subject"] = "test" - user_story_data = JSONRenderer().render(user_story_data) + user_story_data = json.dumps(user_story_data) results = helper_test_http_method(client, 'put', private_url2, user_story_data, users) assert results == [401, 403, 403, 200, 200] diff --git a/tests/integration/resources_permissions/test_wiki_resources.py b/tests/integration/resources_permissions/test_wiki_resources.py index 1ee4b580..0691f775 100644 --- a/tests/integration/resources_permissions/test_wiki_resources.py +++ b/tests/integration/resources_permissions/test_wiki_resources.py @@ -1,18 +1,14 @@ -import pytest from django.core.urlresolvers import reverse -from rest_framework.renderers import JSONRenderer - +from taiga.base.utils import json from taiga.projects.wiki.serializers import WikiPageSerializer, WikiLinkSerializer from taiga.projects.wiki.models import WikiPage, WikiLink from taiga.permissions.permissions import MEMBERS_PERMISSIONS, ANON_PERMISSIONS, USER_PERMISSIONS from tests import factories as f from tests.utils import helper_test_http_method, disconnect_signals, reconnect_signals -from taiga.projects.votes.services import add_vote - -import json +import pytest pytestmark = pytest.mark.django_db @@ -115,19 +111,19 @@ def test_wiki_page_update(client, data): wiki_page_data = WikiPageSerializer(data.public_wiki_page).data wiki_page_data["content"] = "test" - wiki_page_data = JSONRenderer().render(wiki_page_data) + wiki_page_data = json.dumps(wiki_page_data) results = helper_test_http_method(client, 'put', public_url, wiki_page_data, users) assert results == [401, 200, 200, 200, 200] wiki_page_data = WikiPageSerializer(data.private_wiki_page1).data wiki_page_data["content"] = "test" - wiki_page_data = JSONRenderer().render(wiki_page_data) + wiki_page_data = json.dumps(wiki_page_data) results = helper_test_http_method(client, 'put', private_url1, wiki_page_data, users) assert results == [401, 200, 200, 200, 200] wiki_page_data = WikiPageSerializer(data.private_wiki_page2).data wiki_page_data["content"] = "test" - wiki_page_data = JSONRenderer().render(wiki_page_data) + wiki_page_data = json.dumps(wiki_page_data) results = helper_test_http_method(client, 'put', private_url2, wiki_page_data, users) assert results == [401, 403, 403, 200, 200] @@ -294,19 +290,19 @@ def test_wiki_link_update(client, data): wiki_link_data = WikiLinkSerializer(data.public_wiki_link).data wiki_link_data["title"] = "test" - wiki_link_data = JSONRenderer().render(wiki_link_data) + wiki_link_data = json.dumps(wiki_link_data) results = helper_test_http_method(client, 'put', public_url, wiki_link_data, users) assert results == [401, 200, 200, 200, 200] wiki_link_data = WikiLinkSerializer(data.private_wiki_link1).data wiki_link_data["title"] = "test" - wiki_link_data = JSONRenderer().render(wiki_link_data) + wiki_link_data = json.dumps(wiki_link_data) results = helper_test_http_method(client, 'put', private_url1, wiki_link_data, users) assert results == [401, 200, 200, 200, 200] wiki_link_data = WikiLinkSerializer(data.private_wiki_link2).data wiki_link_data["title"] = "test" - wiki_link_data = JSONRenderer().render(wiki_link_data) + wiki_link_data = json.dumps(wiki_link_data) results = helper_test_http_method(client, 'put', private_url2, wiki_link_data, users) assert results == [401, 403, 403, 200, 200] diff --git a/tests/integration/test_attachments.py b/tests/integration/test_attachments.py index f44d34e1..3c498101 100644 --- a/tests/integration/test_attachments.py +++ b/tests/integration/test_attachments.py @@ -4,8 +4,6 @@ from django.core.urlresolvers import reverse from django.core.files.base import File from django.core.files.uploadedfile import SimpleUploadedFile -from rest_framework.renderers import JSONRenderer - from .. import factories as f from ..utils import set_settings diff --git a/tests/integration/test_issues.py b/tests/integration/test_issues.py index db9502f2..cd9439c2 100644 --- a/tests/integration/test_issues.py +++ b/tests/integration/test_issues.py @@ -51,7 +51,7 @@ def test_api_create_issues_in_bulk(client): "project_id": project.id} client.login(project.owner) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 200, response.data diff --git a/tests/integration/test_memberships.py b/tests/integration/test_memberships.py index 5ff6f1dd..4387de9f 100644 --- a/tests/integration/test_memberships.py +++ b/tests/integration/test_memberships.py @@ -46,7 +46,7 @@ def test_api_create_bulk_members(client): ] } client.login(project.owner) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 200 assert response.data[0]["email"] == john.email @@ -75,7 +75,7 @@ def test_api_invite_existing_user(client, outbox): url = reverse("memberships-list") data = {"role": role.pk, "project": role.project.pk, "email": user.email} - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 201, response.data assert len(outbox) == 1 diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index fb1f8c98..7d25ac32 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -13,7 +13,7 @@ def test_api_create_project(client): data = {"name": "project name", "description": "project description"} client.login(user) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 201 @@ -24,6 +24,6 @@ def test_api_partially_update_project(client): data = {"name": ""} client.login(project.owner) - response = client.json.patch(url, json.to_json(data)) + response = client.json.patch(url, json.dumps(data)) assert response.status_code == 400 diff --git a/tests/integration/test_tasks.py b/tests/integration/test_tasks.py index d84205ae..46caa4b0 100644 --- a/tests/integration/test_tasks.py +++ b/tests/integration/test_tasks.py @@ -40,7 +40,7 @@ def test_api_update_task_tags(client): data = {"tags": ["back", "front"], "version": task.version} client.login(task.owner) - response = client.json.patch(url, json.to_json(data)) + response = client.json.patch(url, json.dumps(data)) assert response.status_code == 200, response.data @@ -57,7 +57,7 @@ def test_api_create_in_bulk_with_status(client): } client.login(us.owner) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 200 assert response.data[0]["status"] == us.project.default_task_status.id diff --git a/tests/integration/test_userstories.py b/tests/integration/test_userstories.py index 856002b4..ee17c198 100644 --- a/tests/integration/test_userstories.py +++ b/tests/integration/test_userstories.py @@ -76,7 +76,7 @@ def test_api_create_in_bulk_with_status(client): } client.login(project.owner) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 200, response.data assert response.data[0]["status"] == project.default_us_status.id @@ -94,6 +94,6 @@ def test_api_update_order_in_bulk(client): } client.login(project.owner) - response = client.json.post(url, json.to_json(data)) + response = client.json.post(url, json.dumps(data)) assert response.status_code == 204, response.data