summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Godwin2022-12-02 16:46:43 -0700
committerAndrew Godwin2022-12-02 16:46:43 -0700
commitc299f8aefd503531ae91674211905ba7bc3f62ae (patch)
tree25c1fb49c7d9d29db704c8f3903289b9a911e558
parent250afe4e4014a9baa9b9f347442594b1b6943e7d (diff)
downloadtakahe-c299f8aefd503531ae91674211905ba7bc3f62ae.tar.gz
takahe-c299f8aefd503531ae91674211905ba7bc3f62ae.tar.bz2
takahe-c299f8aefd503531ae91674211905ba7bc3f62ae.zip
Fix broken tests
-rw-r--r--tests/activities/views/test_compose.py46
-rw-r--r--tests/activities/views/test_posts.py43
2 files changed, 47 insertions, 42 deletions
diff --git a/tests/activities/views/test_compose.py b/tests/activities/views/test_compose.py
new file mode 100644
index 0000000..60bbca1
--- /dev/null
+++ b/tests/activities/views/test_compose.py
@@ -0,0 +1,46 @@
+import re
+
+import mock
+import pytest
+from django.core.exceptions import PermissionDenied
+
+from activities.models import Post
+from activities.views.compose import Compose
+
+
+@pytest.mark.django_db
+def test_content_warning_text(identity, user, rf, config_system):
+ request = rf.get("/compose/")
+ request.user = user
+ request.identity = identity
+
+ config_system.content_warning_text = "Content Summary"
+ with mock.patch("core.models.Config.load_system", return_value=config_system):
+ view = Compose.as_view()
+ resp = view(request)
+ assert resp.status_code == 200
+ content = str(resp.rendered_content)
+ assert 'placeholder="Content Summary"' in content
+ assert re.search(
+ r"<label.*>\s*Content Summary\s*</label>", content, flags=re.MULTILINE
+ )
+
+
+@pytest.mark.django_db
+def test_post_edit_security(identity, user, rf, other_identity):
+ # Create post
+ other_post = Post.objects.create(
+ content="<p>OTHER POST!</p>",
+ author=other_identity,
+ local=True,
+ visibility=Post.Visibilities.public,
+ )
+
+ request = rf.get(other_post.get_absolute_url() + "edit/")
+ request.user = user
+ request.identity = identity
+
+ view = Compose.as_view()
+ with pytest.raises(PermissionDenied) as ex:
+ view(request, handle=other_identity.handle.lstrip("@"), post_id=other_post.id)
+ assert str(ex.value) == "Post author is not requestor"
diff --git a/tests/activities/views/test_posts.py b/tests/activities/views/test_posts.py
index c73dcd6..ac148d0 100644
--- a/tests/activities/views/test_posts.py
+++ b/tests/activities/views/test_posts.py
@@ -1,29 +1,8 @@
-import re
-
-import mock
import pytest
from django.core.exceptions import PermissionDenied
from activities.models import Post
-from activities.views.posts import Compose, Delete
-
-
-@pytest.mark.django_db
-def test_content_warning_text(identity, user, rf, config_system):
- request = rf.get("/compose/")
- request.user = user
- request.identity = identity
-
- config_system.content_warning_text = "Content Summary"
- with mock.patch("core.models.Config.load_system", return_value=config_system):
- view = Compose.as_view()
- resp = view(request)
- assert resp.status_code == 200
- content = str(resp.rendered_content)
- assert 'placeholder="Content Summary"' in content
- assert re.search(
- r"<label.*>\s*Content Summary\s*</label>", content, flags=re.MULTILINE
- )
+from activities.views.posts import Delete
@pytest.mark.django_db
@@ -44,23 +23,3 @@ def test_post_delete_security(identity, user, rf, other_identity):
with pytest.raises(PermissionDenied) as ex:
view(request, handle=other_identity.handle.lstrip("@"), post_id=other_post.id)
assert str(ex.value) == "Post author is not requestor"
-
-
-@pytest.mark.django_db
-def test_post_edit_security(identity, user, rf, other_identity):
- # Create post
- other_post = Post.objects.create(
- content="<p>OTHER POST!</p>",
- author=other_identity,
- local=True,
- visibility=Post.Visibilities.public,
- )
-
- request = rf.get(other_post.get_absolute_url() + "edit/")
- request.user = user
- request.identity = identity
-
- view = Compose.as_view()
- with pytest.raises(PermissionDenied) as ex:
- view(request, handle=other_identity.handle.lstrip("@"), post_id=other_post.id)
- assert str(ex.value) == "Post author is not requestor"