diff --git a/tests/factories.py b/tests/factories.py index b4577757..f948598d 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -279,6 +279,7 @@ class IssueFactory(Factory): model = "issues.Issue" strategy = factory.CREATE_STRATEGY + ref = factory.Sequence(lambda n: n) subject = factory.Sequence(lambda n: "Issue {}".format(n)) description = factory.Sequence(lambda n: "Issue {} description".format(n)) owner = factory.SubFactory("tests.factories.UserFactory") diff --git a/tests/integration/resources_permissions/test_resolver_resources.py b/tests/integration/resources_permissions/test_resolver_resources.py index 009500ff..cdd164a0 100644 --- a/tests/integration/resources_permissions/test_resolver_resources.py +++ b/tests/integration/resources_permissions/test_resolver_resources.py @@ -82,10 +82,10 @@ def data(): role__project=m.private_project2, role__permissions=["view_project"]) - f.UserStoryFactory(project=m.private_project2, ref=1, pk=1) - f.TaskFactory(project=m.private_project2, ref=2, pk=1) - f.IssueFactory(project=m.private_project2, ref=3, pk=1) - m.milestone = f.MilestoneFactory(project=m.private_project2, slug=4, pk=1) + 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) + m.milestone = f.MilestoneFactory(project=m.private_project2, slug="milestone-test-1") return m @@ -101,17 +101,32 @@ def test_resolver_list(client, data): data.project_owner ] - results = helper_test_http_method(client, 'get', "{}?project=public".format(url), None, users) + results = helper_test_http_method(client, 'get', "{}?project={}".format(url, data.public_project.slug), None, users) assert results == [200, 200, 200, 200, 200] - results = helper_test_http_method(client, 'get', "{}?project=private1".format(url), None, users) + results = helper_test_http_method(client, 'get', "{}?project={}".format(url,data.private_project1.slug), None, users) assert results == [200, 200, 200, 200, 200] - results = helper_test_http_method(client, 'get', "{}?project=private2".format(url), None, users) + results = helper_test_http_method(client, 'get', "{}?project={}".format(url, data.private_project2.slug), None, users) assert results == [401, 403, 403, 200, 200] client.login(data.other_user) - response = client.get("{}?project=private2&us=1&task=2&issue=3&milestone=4".format(url)) - assert json.loads(response.content.decode('utf-8')) == {"project": data.private_project2.pk} + response = client.json.get("{}?project={}&us={}&task={}&issue={}&milestone={}".format(url, + data.private_project2.slug, + data.us.ref, + data.task.ref, + data.issue.ref, + data.milestone.slug)) + import ipdb; ipdb.set_trace() + assert response.data == {"project": data.private_project2.pk} client.login(data.project_owner) - response = client.get("{}?project=private2&us=1&task=2&issue=3&milestone=4".format(url)) - assert json.loads(response.content.decode('utf-8')) == {"project": data.private_project2.pk, "us": 1, "task": 1, "issue": 1, "milestone": data.milestone.pk} + response = client.json.get("{}?project={}&us={}&task={}&issue={}&milestone={}".format(url, + data.private_project2.slug, + data.us.ref, + data.task.ref, + data.issue.ref, + data.milestone.slug)) + assert response.data == {"project": data.private_project2.pk, + "us": data.us.pk, + "task": data.task.pk, + "issue": data.issue.pk, + "milestone": data.milestone.pk}