X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fweb%2Fwebsub%2Fwebsub_test.exs;h=e0d71e16d96d72928eadbdcfd8478bef99d09d3a;hb=20015b4b67cf0dfab6bdb658c9eb0e1ae04febdc;hp=ca04a55cd08c145f55b8149e4ef27cccea2fa7f2;hpb=451d18af63fcf97f0d9621e5bfe296e1f18a0312;p=akkoma

diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs
index ca04a55cd..e0d71e16d 100644
--- a/test/web/websub/websub_test.exs
+++ b/test/web/websub/websub_test.exs
@@ -93,12 +93,13 @@ defmodule Pleroma.Web.WebsubTest do
   end
 
   test "initiate a subscription for a given user and topic" do
-    user = insert(:user)
-    topic = "http://example.org/some-topic.atom"
+    subscriber = insert(:user)
+    user = insert(:user, %{info: %{ "topic" =>  "some_topic", "hub" => "some_hub"}})
 
-    {:ok, websub} = Websub.subscribe(user, topic, &accepting_verifier/1)
-    assert websub.subscribers == [user.ap_id]
-    assert websub.topic == topic
+    {:ok, websub} = Websub.subscribe(subscriber, user, &accepting_verifier/1)
+    assert websub.subscribers == [subscriber.ap_id]
+    assert websub.topic == "some_topic"
+    assert websub.hub == "some_hub"
     assert is_binary(websub.secret)
     assert websub.user == user
     assert websub.state == "accepted"
@@ -112,8 +113,16 @@ defmodule Pleroma.Web.WebsubTest do
       {:ok, %{status_code: 200, body: doc}}
     end
 
-    {:ok, discovered} = Websub.discover(topic, getter)
-    assert %{hub: "https://mastodon.social/api/push", url: topic} == discovered
+    {:ok, discovered} = Websub.gather_feed_data(topic, getter)
+    expected = %{
+      hub: "https://mastodon.social/api/push",
+      uri: "https://mastodon.social/users/lambadalambda",
+      nickname: "lambadalambda",
+      name: "Critical Value",
+      host: "mastodon.social"
+    }
+
+    assert expected == discovered
   end
 
   test "calls the hub, requests topic" do