X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fwebsub%2Fwebsub_test.exs;h=566ce7fa5a4b9b454a69ead753947ff5f3bbabb7;hb=c1d529ee9491fc0040cd4327c783aabf76cb66a8;hp=bf243ac91ccba4a750a11a9f4f7300de6e775523;hpb=90da25505f9cfbd16a9088e20714b24c2c6fa215;p=akkoma

diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs
index bf243ac91..566ce7fa5 100644
--- a/test/web/websub/websub_test.exs
+++ b/test/web/websub/websub_test.exs
@@ -3,11 +3,13 @@ defmodule Pleroma.Web.WebsubMock do
     {:ok, sub}
   end
 end
+
 defmodule Pleroma.Web.WebsubTest do
   use Pleroma.DataCase
   alias Pleroma.Web.Websub
-  alias Pleroma.Web.Websub.WebsubServerSubscription
+  alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
   import Pleroma.Factory
+  alias Pleroma.Web.Router.Helpers
 
   test "a verification of a request that is accepted" do
     sub = insert(:websub_subscription)
@@ -44,7 +46,8 @@ defmodule Pleroma.Web.WebsubTest do
     end
 
     {:error, sub} = Websub.verify(sub, getter)
-    assert sub.state == "rejected"
+    # Keep the current state.
+    assert sub.state == "requested"
   end
 
   test "an incoming subscription request" do
@@ -91,12 +94,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"
@@ -110,8 +114,18 @@ 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",
+      "bio" => "a cool dude.",
+      "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif?1492379244", "mediaType" => "image/gif", "type" => "Link"}]}
+    }
+
+    assert expected == discovered
   end
 
   test "calls the hub, requests topic" do
@@ -121,6 +135,7 @@ defmodule Pleroma.Web.WebsubTest do
 
     poster = fn (^hub, {:form, data}, _headers) ->
       assert Keyword.get(data, :"hub.mode") == "subscribe"
+      assert Keyword.get(data, :"hub.callback") == Helpers.websub_url(Pleroma.Web.Endpoint, :websub_subscription_confirmation, websub.id)
       {:ok, %{status_code: 202}}
     end
 
@@ -154,4 +169,25 @@ defmodule Pleroma.Web.WebsubTest do
     {:error, websub} = Websub.request_subscription(websub, poster, 1000)
     assert websub.state == "rejected"
   end
+
+  test "sign a text" do
+    signed = Websub.sign("secret", "text")
+    assert signed == "B8392C23690CCF871F37EC270BE1582DEC57A503" |> String.downcase
+
+    _signed = Websub.sign("secret", [["て"], ['す']])
+  end
+
+  describe "renewing subscriptions" do
+    test "it renews subscriptions that have less than a day of time left" do
+      day = 60 * 60 * 24
+      now = NaiveDateTime.utc_now
+      still_good = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, 2 * day), topic: "http://example.org/still_good", state: "accepted"})
+      needs_refresh = insert(:websub_client_subscription, %{valid_until: NaiveDateTime.add(now, day - 100), topic: "http://example.org/needs_refresh", state: "accepted"})
+
+      _refresh = Websub.refresh_subscriptions()
+
+      assert still_good == Repo.get(WebsubClientSubscription, still_good.id)
+      refute needs_refresh == Repo.get(WebsubClientSubscription, needs_refresh.id)
+    end
+  end
 end