X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fwebsub%2Fwebsub_controller_test.exs;h=aa7262beb1eb3c6d2a0cec2dabdead769e2523c2;hb=1179a135333aa59e7fa4f5b908e1db8257b994f5;hp=cb19d6fe60e87f73ae2bd3f0532f712f743ca510;hpb=d3f9e6f6fed382ede8e314c370c21e84a119f65a;p=akkoma

diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs
index cb19d6fe6..aa7262beb 100644
--- a/test/web/websub/websub_controller_test.exs
+++ b/test/web/websub/websub_controller_test.exs
@@ -5,9 +5,19 @@
 defmodule Pleroma.Web.Websub.WebsubControllerTest do
   use Pleroma.Web.ConnCase
   import Pleroma.Factory
-  alias Pleroma.Web.Websub.WebsubClientSubscription
-  alias Pleroma.{Repo, Activity, Instances}
+  alias Pleroma.Repo
   alias Pleroma.Web.Websub
+  alias Pleroma.Web.Websub.WebsubClientSubscription
+
+  setup_all do
+    config_path = [:instance, :federating]
+    initial_setting = Pleroma.Config.get(config_path)
+
+    Pleroma.Config.put(config_path, true)
+    on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)
+
+    :ok
+  end
 
   test "websub subscription request", %{conn: conn} do
     user = insert(:user)
@@ -51,7 +61,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)
@@ -63,8 +73,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
@@ -79,28 +87,6 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do
         |> post("/push/subscriptions/#{websub.id}", doc)
 
       assert response(conn, 500) == "Error"
-
-      assert length(Repo.all(Activity)) == 0
-    end
-
-    test "it clears `unreachable` federation status of the sender", %{conn: conn} do
-      sender_url = "https://pleroma.soykaf.com"
-      Instances.set_consistently_unreachable(sender_url)
-      refute Instances.reachable?(sender_url)
-
-      websub = insert(:websub_client_subscription)
-      doc = "some stuff"
-      signature = Websub.sign(websub.secret, doc)
-
-      conn =
-        conn
-        |> put_req_header("x-hub-signature", "sha1=" <> signature)
-        |> put_req_header("content-type", "application/atom+xml")
-        |> put_req_header("referer", sender_url)
-        |> post("/push/subscriptions/#{websub.id}", doc)
-
-      assert response(conn, 200) == "OK"
-      assert Instances.reachable?(sender_url)
     end
   end
 end