[Backport] Fixing tests

remotes/origin/issue/4217/improving-mail-design
Alejandro Alonso 2016-10-20 15:27:57 +02:00
parent 4d7d873302
commit d28846dc9e
3 changed files with 108 additions and 104 deletions

View File

@ -60,33 +60,42 @@ def data():
m.project_owner = f.UserFactory.create()
m.other_user = f.UserFactory.create()
m.public_points = f.PointsFactory()
m.public_project = f.ProjectFactory(is_private=False,
anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)),
public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)),
owner=m.project_owner,
userstories_csv_uuid=uuid.uuid4().hex)
userstories_csv_uuid=uuid.uuid4().hex,
default_points=m.public_points)
m.public_project = attach_project_extra_info(Project.objects.all()).get(id=m.public_project.id)
m.private_points1 = f.PointsFactory()
m.private_project1 = f.ProjectFactory(is_private=True,
anon_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)),
public_permissions=list(map(lambda x: x[0], ANON_PERMISSIONS)),
owner=m.project_owner,
userstories_csv_uuid=uuid.uuid4().hex)
userstories_csv_uuid=uuid.uuid4().hex,
default_points=m.private_points1)
m.private_project1 = attach_project_extra_info(Project.objects.all()).get(id=m.private_project1.id)
m.private_points2 = f.PointsFactory()
m.private_project2 = f.ProjectFactory(is_private=True,
anon_permissions=[],
public_permissions=[],
owner=m.project_owner,
userstories_csv_uuid=uuid.uuid4().hex)
userstories_csv_uuid=uuid.uuid4().hex,
default_points=m.private_points2)
m.private_project2 = attach_project_extra_info(Project.objects.all()).get(id=m.private_project2.id)
m.blocked_points = f.PointsFactory()
m.blocked_project = f.ProjectFactory(is_private=True,
anon_permissions=[],
public_permissions=[],
owner=m.project_owner,
userstories_csv_uuid=uuid.uuid4().hex,
blocked_code=project_choices.BLOCKED_BY_STAFF)
blocked_code=project_choices.BLOCKED_BY_STAFF,
default_points=m.blocked_points)
m.blocked_project = attach_project_extra_info(Project.objects.all()).get(id=m.blocked_project.id)
m.public_membership = f.MembershipFactory(
@ -138,39 +147,24 @@ def data():
user=m.project_owner,
is_admin=True)
m.public_points = f.PointsFactory(project=m.public_project)
m.private_points1 = f.PointsFactory(project=m.private_project1)
m.private_points2 = f.PointsFactory(project=m.private_project2)
m.blocked_points = f.PointsFactory(project=m.blocked_project)
m.public_role_points = f.RolePointsFactory(role=m.public_project.roles.all()[0],
points=m.public_points,
user_story__project=m.public_project,
user_story__milestone__project=m.public_project,
user_story__status__project=m.public_project)
m.private_role_points1 = f.RolePointsFactory(role=m.private_project1.roles.all()[0],
points=m.private_points1,
user_story__project=m.private_project1,
user_story__milestone__project=m.private_project1,
user_story__status__project=m.private_project1)
m.private_role_points2 = f.RolePointsFactory(role=m.private_project2.roles.all()[0],
points=m.private_points2,
user_story__project=m.private_project2,
user_story__milestone__project=m.private_project2,
user_story__status__project=m.private_project2)
m.blocked_role_points = f.RolePointsFactory(role=m.blocked_project.roles.all()[0],
points=m.blocked_points,
user_story__project=m.blocked_project,
user_story__milestone__project=m.blocked_project,
user_story__status__project=m.blocked_project)
m.public_user_story = m.public_role_points.user_story
m.public_user_story = f.UserStoryFactory(project=m.public_project,
milestone__project=m.public_project,
status__project=m.public_project)
m.public_user_story = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.public_user_story.id)
m.private_user_story1 = m.private_role_points1.user_story
m.private_user_story1 = f.UserStoryFactory(project=m.private_project1,
milestone__project=m.private_project1,
status__project=m.private_project1)
m.private_user_story1 = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.private_user_story1.id)
m.private_user_story2 = m.private_role_points2.user_story
m.private_user_story2 = f.UserStoryFactory(project=m.private_project2,
milestone__project=m.private_project2,
status__project=m.private_project2)
m.private_user_story2 = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.private_user_story2.id)
m.blocked_user_story = m.blocked_role_points.user_story
m.blocked_user_story = f.UserStoryFactory(project=m.blocked_project,
milestone__project=m.blocked_project,
status__project=m.blocked_project)
m.blocked_user_story = attach_userstory_extra_info(UserStory.objects.all()).get(id=m.blocked_user_story.id)
return m
@ -274,24 +268,28 @@ def test_user_story_put_update(client, data):
with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"):
user_story_data = UserStorySerializer(data.public_user_story).data
del user_story_data["points"]
user_story_data["subject"] = "test"
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
del user_story_data["points"]
user_story_data["subject"] = "test"
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
del user_story_data["points"]
user_story_data["subject"] = "test"
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]
user_story_data = UserStorySerializer(data.blocked_user_story).data
del user_story_data["points"]
user_story_data["subject"] = "test"
user_story_data = json.dumps(user_story_data)
results = helper_test_http_method(client, 'put', blocked_url, user_story_data, users)
@ -314,24 +312,28 @@ def test_user_story_put_comment(client, data):
with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"):
user_story_data = UserStorySerializer(data.public_user_story).data
del user_story_data["points"]
user_story_data["comment"] = "test comment"
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
del user_story_data["points"]
user_story_data["comment"] = "test comment"
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
del user_story_data["points"]
user_story_data["comment"] = "test comment"
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]
user_story_data = UserStorySerializer(data.blocked_user_story).data
del user_story_data["points"]
user_story_data["comment"] = "test comment"
user_story_data = json.dumps(user_story_data)
results = helper_test_http_method(client, 'put', blocked_url, user_story_data, users)
@ -354,6 +356,7 @@ def test_user_story_put_update_and_comment(client, data):
with mock.patch.object(OCCResourceMixin, "_validate_and_update_version"):
user_story_data = UserStorySerializer(data.public_user_story).data
del user_story_data["points"]
user_story_data["subject"] = "test"
user_story_data["comment"] = "test comment"
user_story_data = json.dumps(user_story_data)
@ -361,6 +364,7 @@ def test_user_story_put_update_and_comment(client, data):
assert results == [401, 403, 403, 200, 200]
user_story_data = UserStorySerializer(data.private_user_story1).data
del user_story_data["points"]
user_story_data["subject"] = "test"
user_story_data["comment"] = "test comment"
user_story_data = json.dumps(user_story_data)
@ -368,6 +372,7 @@ def test_user_story_put_update_and_comment(client, data):
assert results == [401, 403, 403, 200, 200]
user_story_data = UserStorySerializer(data.private_user_story2).data
del user_story_data["points"]
user_story_data["subject"] = "test"
user_story_data["comment"] = "test comment"
user_story_data = json.dumps(user_story_data)
@ -375,6 +380,7 @@ def test_user_story_put_update_and_comment(client, data):
assert results == [401, 403, 403, 200, 200]
user_story_data = UserStorySerializer(data.blocked_user_story).data
del user_story_data["points"]
user_story_data["subject"] = "test"
user_story_data["comment"] = "test comment"
user_story_data = json.dumps(user_story_data)
@ -392,9 +398,13 @@ def test_user_story_put_update_with_project_change(client):
us_status1 = f.UserStoryStatusFactory.create(project=project1)
us_status2 = f.UserStoryStatusFactory.create(project=project2)
points1 = f.PointsFactory.create(project=project1)
points2 = f.PointsFactory.create(project=project2)
project1.default_us_status = us_status1
project2.default_us_status = us_status2
project1.default_points = points1
project2.default_points = points2
project1.save()
project2.save()
@ -429,6 +439,7 @@ def test_user_story_put_update_with_project_change(client):
us_data = UserStorySerializer(us).data
us_data["project"] = project2.id
del us_data["points"]
us_data = json.dumps(us_data)
response = client.put(url, data=us_data, content_type="application/json")
@ -443,6 +454,7 @@ def test_user_story_put_update_with_project_change(client):
us_data = UserStorySerializer(us).data
us_data["project"] = project2.id
del us_data["points"]
us_data = json.dumps(us_data)
response = client.put(url, data=us_data, content_type="application/json")
@ -457,6 +469,7 @@ def test_user_story_put_update_with_project_change(client):
us_data = UserStorySerializer(us).data
us_data["project"] = project2.id
del us_data["points"]
us_data = json.dumps(us_data)
response = client.put(url, data=us_data, content_type="application/json")
@ -471,6 +484,7 @@ def test_user_story_put_update_with_project_change(client):
us_data = UserStorySerializer(us).data
us_data["project"] = project2.id
del us_data["points"]
us_data = json.dumps(us_data)
response = client.put(url, data=us_data, content_type="application/json")

View File

@ -42,11 +42,15 @@ def test_project_update_role_points():
"""
project = f.ProjectFactory.create()
related_role = f.RoleFactory.create(project=project, computable=True)
not_related_role = f.RoleFactory.create(project=project, computable=True)
null_points = f.PointsFactory.create(project=project, value=None)
user_story = f.UserStoryFactory(project=project)
user_story.role_points.add(f.RolePointsFactory(role=related_role, points=null_points))
new_related_role = f.RoleFactory.create(project=project, computable=True)
assert user_story.role_points.count() == 1
assert user_story.role_points.filter(role=new_related_role, points=null_points).count() == 0
project.update_role_points()
assert user_story.role_points.filter(role=not_related_role, points=null_points).count() == 1
assert user_story.role_points.count() == 2
assert user_story.role_points.filter(role=new_related_role, points=null_points).count() == 1

View File

@ -48,6 +48,7 @@ def data():
m.role2 = f.RoleFactory(project=m.project)
m.null_points = f.PointsFactory(project=m.project, value=None)
m.default_points = f.PointsFactory(project=m.project, value=0)
m.points1 = f.PointsFactory(project=m.project, value=1)
m.points2 = f.PointsFactory(project=m.project, value=2)
m.points3 = f.PointsFactory(project=m.project, value=4)
@ -57,94 +58,83 @@ def data():
m.open_status = f.UserStoryStatusFactory(is_closed=False)
m.closed_status = f.UserStoryStatusFactory(is_closed=True)
m.project.default_points = m.default_points
m.project.save()
m.user_story1 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone=None)
m.user_story1.role_points.filter(role=m.role1).update(points=m.points1)
m.user_story2 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone=None)
m.user_story2.role_points.filter(role=m.role1).update(points=m.points2)
m.user_story3 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone=None)
m.user_story3.role_points.filter(role=m.role1).update(points=m.points3)
m.user_story4 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone=None)
m.user_story4.role_points.filter(role=m.role1).update(points=m.points4)
m.role_points1 = f.RolePointsFactory(role=m.role1,
points=m.points1,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone=None)
m.role_points2 = f.RolePointsFactory(role=m.role1,
points=m.points2,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone=None)
m.role_points3 = f.RolePointsFactory(role=m.role1,
points=m.points3,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone=None)
m.role_points4 = f.RolePointsFactory(role=m.project.roles.all()[0],
points=m.points4,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone=None)
# 5 and 6 are inclosed milestones
m.role_points5 = f.RolePointsFactory(role=m.project.roles.all()[0],
points=m.points5,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone__closed=True,
user_story__milestone__project=m.project)
m.role_points6 = f.RolePointsFactory(role=m.project.roles.all()[0],
points=m.points6,
user_story__project=m.project,
user_story__status=m.open_status,
user_story__milestone__closed=True,
user_story__milestone__project=m.project)
m.user_story5 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone__closed=True,
milestone__project=m.project)
m.user_story1 = m.role_points1.user_story
m.user_story2 = m.role_points2.user_story
m.user_story3 = m.role_points3.user_story
m.user_story4 = m.role_points4.user_story
m.user_story5 = m.role_points5.user_story
m.user_story6 = m.role_points6.user_story
m.user_story5.role_points.filter(role=m.role1).update(points=m.points5)
m.milestone = f.MilestoneFactory(project=m.project)
m.user_story6 = f.UserStoryFactory(project=m.project,
status=m.open_status,
milestone__closed=True,
milestone__project=m.project)
m.user_story6.role_points.filter(role=m.role1).update(points=m.points6)
return m
def test_project_defined_points(client, data):
project_stats = get_stats_for_project(data.project)
assert project_stats["defined_points_per_role"] == {data.role1.pk: 63}
data.role_points1.role = data.role2
data.role_points1.save()
assert project_stats["defined_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0}
data.user_story1.role_points.filter(role=data.role1).update(points=data.default_points)
data.user_story1.role_points.filter(role=data.role2).update(points=data.points1)
project_stats = get_stats_for_project(data.project)
assert project_stats["defined_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1}
def test_project_closed_points(client, data):
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {}
data.role_points1.role = data.role2
data.role_points1.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {}
data.user_story1.is_closed = True
data.user_story1.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 1, data.role2.pk: 0}
data.user_story2.is_closed = True
data.user_story2.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role1.pk: 2, data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 3, data.role2.pk: 0}
data.user_story3.is_closed = True
data.user_story3.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role1.pk: 6, data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 7, data.role2.pk: 0}
data.user_story4.is_closed = True
data.user_story4.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role1.pk: 14, data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 15, data.role2.pk: 0}
data.user_story5.is_closed = True
data.user_story5.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role1.pk: 30, data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 31, data.role2.pk: 0}
data.user_story6.is_closed = True
data.user_story6.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1}
assert project_stats["closed_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0}
project_stats = get_stats_for_project(data.project)
assert project_stats["closed_points"] == 63
@ -153,24 +143,20 @@ def test_project_closed_points(client, data):
def test_project_assigned_points(client, data):
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48}
data.role_points1.role = data.role2
data.role_points1.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48}
data.user_story1.milestone = data.milestone
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48, data.role2.pk: 0}
data.user_story1.milestone = data.user_story6.milestone
data.user_story1.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 48, data.role2.pk: 1}
data.user_story2.milestone = data.milestone
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 49, data.role2.pk: 0}
data.user_story2.milestone = data.user_story6.milestone
data.user_story2.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 50, data.role2.pk: 1}
data.user_story3.milestone = data.milestone
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 51, data.role2.pk: 0}
data.user_story3.milestone = data.user_story6.milestone
data.user_story3.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 54, data.role2.pk: 1}
data.user_story4.milestone = data.milestone
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 55, data.role2.pk: 0}
data.user_story4.milestone = data.user_story6.milestone
data.user_story4.save()
project_stats = get_stats_for_project(data.project)
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 62, data.role2.pk: 1}
assert project_stats["assigned_points_per_role"] == {data.role1.pk: 63, data.role2.pk: 0}