Fix some tests

taiga/projects/epics/api.py

@@ -118,6 +118,7 @@ class EpicViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin,
                 data.append({"epic_id": int(id), "order": order})
 
             return services.update_epics_order_in_bulk(data,
+                                                       "epics_order",
                                                        project=obj.project)
         return {}
 

tests/integration/resources_permissions/test_epics_resources.py

@@ -703,85 +703,6 @@ def test_bulk_create_related_userstories(client, data):
     assert results == [401, 403, 403, 451, 451]
 
 
-def test_set_related_user_story(client, data):
-    users = [
-        None,
-        data.registered_user,
-        data.project_member_without_perms,
-        data.project_member_with_perms,
-        data.project_owner
-    ]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.public_epic.pk})
-    edit_data = json.dumps({
-        "us_id": data.public_us.pk,
-        "order": 33,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [401, 403, 403, 200, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.private_epic1.pk})
-    edit_data = json.dumps({
-        "us_id": data.private_us1.pk,
-        "order": 33,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [401, 403, 403, 200, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.private_epic2.pk})
-    edit_data = json.dumps({
-        "us_id": data.private_us2.pk,
-        "order": 33,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [404, 404, 404, 200, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.blocked_epic.pk})
-    edit_data = json.dumps({
-        "us_id": data.blocked_us.pk,
-        "order": 33,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [404, 404, 404, 451, 451]
-
-
-def test_unset_related_user_story(client, data):
-    users = [
-        None,
-        data.registered_user,
-        data.project_member_without_perms,
-        data.project_member_with_perms
-    ]
-
-    url = reverse('epics-unset-related-userstory', kwargs={"pk": data.public_epic.pk})
-    edit_data = json.dumps({
-        "us_id": data.public_related_us.user_story.pk,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [401, 403, 403, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.private_epic1.pk})
-    edit_data = json.dumps({
-        "us_id": data.private_related_us1.user_story.pk,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [401, 403, 403, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.private_epic2.pk})
-    edit_data = json.dumps({
-        "us_id": data.private_related_us2.user_story.pk,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [404, 404, 404, 200]
-
-    url = reverse('epics-set-related-userstory', kwargs={"pk": data.blocked_epic.pk})
-    edit_data = json.dumps({
-        "us_id": data.blocked_related_us.user_story.pk,
-    })
-    results = helper_test_http_method(client, 'post', url, edit_data, users)
-    assert results == [404, 404, 404, 451]
-
-
 def test_epic_action_upvote(client, data):
     public_url = reverse('epics-upvote', kwargs={"pk": data.public_epic.pk})
     private_url1 = reverse('epics-upvote', kwargs={"pk": data.private_epic1.pk})

tests/integration/resources_permissions/test_projects_choices_resources.py

@@ -2047,8 +2047,8 @@ def test_membership_action_bulk_create(client, data):
     bulk_data = {
         "project_id": data.blocked_project.id,
         "bulk_memberships": [
-            {"role_id": data.private_membership2.role.pk, "email": "test1@test.com"},
+            {"role_id": data.blocked_membership.role.pk, "email": "test1@test.com"},
-            {"role_id": data.private_membership2.role.pk, "email": "test2@test.com"},
+            {"role_id": data.blocked_membership.role.pk, "email": "test2@test.com"},
         ]
     }
     bulk_data = json.dumps(bulk_data)