Some tests fixed

remotes/origin/enhancement/email-actions
Jesús Espino 2014-07-31 12:00:43 +02:00
parent e55acc11c2
commit b0d96d16df
6 changed files with 18 additions and 42 deletions

View File

@ -98,7 +98,7 @@ class TaskViewSet(OCCResourceMixin, HistoryResourceMixin, WatchedResourceMixin,
if status_id:
status = get_object_or_404(TaskStatus, id=status_id)
else:
status = project.default_us_status
status = project.default_task_status
tasks = services.create_tasks_in_bulk(bulk_tasks, callback=self.post_save, project=project,
user_story=user_story, owner=request.user,

View File

@ -190,6 +190,7 @@ class UsersViewSet(ModelCrudViewSet):
def destroy(self, request, pk=None):
user = self.get_object()
self.check_permissions(request, "destroy", user)
user.username = slugify_uniquely("deleted-user", models.User, slugfield="username")
user.email = "deleted-user@taiga.io"
user.is_active = False

View File

@ -270,6 +270,7 @@ def test_task_action_bulk_create(client, data):
"bulkTasks": "test1\ntest2",
"usId": data.public_task.user_story.pk,
"projectId": data.public_task.project.pk,
"sprintId": data.public_task.milestone.pk,
})
results = helper_test_http_method(client, 'post', url, bulk_data, users)
assert results == [401, 403, 403, 200, 200]
@ -278,6 +279,7 @@ def test_task_action_bulk_create(client, data):
"bulkTasks": "test1\ntest2",
"usId": data.private_task1.user_story.pk,
"projectId": data.private_task1.project.pk,
"sprintId": data.private_task1.milestone.pk,
})
results = helper_test_http_method(client, 'post', url, bulk_data, users)
assert results == [401, 403, 403, 200, 200]
@ -286,6 +288,7 @@ def test_task_action_bulk_create(client, data):
"bulkTasks": "test1\ntest2",
"usId": data.private_task2.user_story.pk,
"projectId": data.private_task2.project.pk,
"sprintId": data.private_task2.milestone.pk,
})
results = helper_test_http_method(client, 'post', url, bulk_data, users)
assert results == [401, 403, 403, 200, 200]

View File

@ -143,6 +143,13 @@ def test_user_patch(client, data):
def test_user_action_change_password(client, data):
url = reverse('users-change-password')
data.registered_user.set_password("test-current-password")
data.registered_user.save()
data.other_user.set_password("test-current-password")
data.other_user.save()
data.superuser.set_password("test-current-password")
data.superuser.save()
users = [
None,
data.registered_user,
@ -150,7 +157,8 @@ def test_user_action_change_password(client, data):
data.superuser,
]
patch_data = json.dumps({"password": "test-password"})
patch_data = json.dumps({"current_password": "test-current-password", "password": "test-password"})
results = helper_test_http_method(client, 'post', url, patch_data, users)
assert results == [401, 204, 204, 204]
@ -189,42 +197,3 @@ def test_user_action_password_recovery(client, data):
patch_data = json.dumps({"username": "test"})
results = helper_test_http_method(client, 'post', url, patch_data, users)
assert results == [200, 200, 200, 200]
# def test_membership_retrieve(client, data):
# assert False
#
#
# def test_membership_update(client, data):
# assert False
#
#
# def test_membership_delete(client, data):
# assert False
#
#
# def test_membership_list(client, data):
# assert False
#
#
# def test_membership_patch(client, data):
# assert False
#
#
# def test_invitation_retrieve(client, data):
# assert False
#
#
# def test_invitation_update(client, data):
# assert False
#
#
# def test_invitation_delete(client, data):
# assert False
#
#
# def test_invitation_list(client, data):
# assert False
#
#
# def test_invitation_patch(client, data):
# assert False

View File

@ -33,7 +33,7 @@ dummy_project.slug = "test"
def test_proccessor_valid_user_mention():
factories.UserFactory(username="user1", full_name="test name")
result = render(dummy_project, "**@user1**")
expected_result = "<p><strong><a alt=\"test name\" class=\"mention\" href=\"/#/profile/user1\" title=\"test name\">&commat;user1</a></strong></p>"
expected_result = "<p><strong><a alt=\"test name\" class=\"mention\" href=\"/profile/user1\" title=\"test name\">&commat;user1</a></strong></p>"
assert result == expected_result

View File

@ -69,6 +69,9 @@ def test_api_invite_existing_user(client, outbox):
"Should create the invitation linked to that user"
user = f.UserFactory.create()
role = f.RoleFactory.create()
client.login(role.project.owner)
url = reverse("memberships-list")
data = {"role": role.pk, "project": role.project.pk, "email": user.email}