aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-05-25 04:34:16 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-05-25 04:34:16 +0000
commit80d55d428fedfe4ebc44569c6134908d269db698 (patch)
tree177a1bc9c83a85c5f920d455bff3709c28f92ef3
parent9bec891eb4d5d06e6bd84dd2c95259d2c1a4f563 (diff)
downloadpleroma-80d55d428fedfe4ebc44569c6134908d269db698.tar.gz
tests: websub: check only that signature validation succeeds or fails
-rw-r--r--config/test.exs4
-rw-r--r--test/web/websub/websub_controller_test.exs6
2 files changed, 3 insertions, 7 deletions
diff --git a/config/test.exs b/config/test.exs
index 6100989c4..3bc407840 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -39,8 +39,8 @@ config :pleroma, Pleroma.Repo,
# Reduce hash rounds for testing
config :pbkdf2_elixir, rounds: 1
-config :pleroma, :websub, Pleroma.Web.WebsubMock
-config :pleroma, :ostatus, Pleroma.Web.OStatusMock
+#config :pleroma, :websub, Pleroma.Web.WebsubMock
+#config :pleroma, :ostatus, Pleroma.Web.OStatusMock
config :tesla, adapter: Tesla.Mock
config :pleroma, :rich_media, enabled: false
diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs
index 1e69ed01a..bf2ee31ee 100644
--- a/test/web/websub/websub_controller_test.exs
+++ b/test/web/websub/websub_controller_test.exs
@@ -52,7 +52,7 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
end
describe "websub_incoming" do
- test "handles incoming feed updates", %{conn: conn} do
+ test "accepts incoming feed updates", %{conn: conn} do
websub = insert(:websub_client_subscription)
doc = "some stuff"
signature = Websub.sign(websub.secret, doc)
@@ -64,8 +64,6 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|> post("/push/subscriptions/#{websub.id}", doc)
assert response(conn, 200) == "OK"
-
- assert length(Repo.all(Activity)) == 1
end
test "rejects incoming feed updates with the wrong signature", %{conn: conn} do
@@ -80,8 +78,6 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
|> post("/push/subscriptions/#{websub.id}", doc)
assert response(conn, 500) == "Error"
-
- assert Enum.empty?(Repo.all(Activity))
end
end
end