X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fobject_test.exs;h=ba96aeea4d67ba793e5181fc9b1844bdf7daaa8e;hb=fb7332aec7e5db781ffddf01e1510ffbfc9eac11;hp=ab643101253fda533f61150aea58f1c222dbd6f4;hpb=6c8d15da110e86f799052c82df8b7b2404f8f722;p=akkoma

diff --git a/test/object_test.exs b/test/object_test.exs
index ab6431012..ba96aeea4 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -5,7 +5,14 @@
 defmodule Pleroma.ObjectTest do
   use Pleroma.DataCase
   import Pleroma.Factory
-  alias Pleroma.{Repo, Object}
+  import Tesla.Mock
+  alias Pleroma.Object
+  alias Pleroma.Repo
+
+  setup do
+    mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
 
   test "returns an object by it's AP id" do
     object = insert(:note)
@@ -46,9 +53,12 @@ defmodule Pleroma.ObjectTest do
 
       assert object == cached_object
 
+      Cachex.put(:web_resp_cache, URI.parse(object.data["id"]).path, "cofe")
+
       Object.delete(cached_object)
 
       {:ok, nil} = Cachex.get(:object_cache, "object:#{object.data["id"]}")
+      {:ok, nil} = Cachex.get(:web_resp_cache, URI.parse(object.data["id"]).path)
 
       cached_object = Object.get_cached_by_ap_id(object.data["id"])
 
@@ -58,31 +68,25 @@ defmodule Pleroma.ObjectTest do
     end
   end
 
-  describe "insert_or_get" do
-    test "inserting the same object twice (by id) just returns the original object" do
-      data = %{data: %{"id" => Ecto.UUID.generate()}}
-      cng = Object.change(%Object{}, data)
-      {:ok, object} = Object.insert_or_get(cng)
-      {:ok, second_object} = Object.insert_or_get(cng)
+  describe "normalizer" do
+    test "fetches unknown objects by default" do
+      %Object{} =
+        object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367")
 
-      Cachex.clear(:object_cache)
-      {:ok, third_object} = Object.insert_or_get(cng)
-
-      assert object == second_object
-      assert object == third_object
+      assert object.data["url"] == "http://mastodon.example.org/@admin/99541947525187367"
     end
-  end
 
-  describe "create" do
-    test "inserts an object for a given data set" do
-      data = %{"id" => Ecto.UUID.generate()}
+    test "fetches unknown objects when fetch_remote is explicitly true" do
+      %Object{} =
+        object = Object.normalize("http://mastodon.example.org/@admin/99541947525187367", true)
 
-      {:ok, object} = Object.create(data)
-      assert object.data["id"] == data["id"]
+      assert object.data["url"] == "http://mastodon.example.org/@admin/99541947525187367"
+    end
 
-      # Works when doing it twice.
-      {:ok, object} = Object.create(data)
-      assert object.data["id"] == data["id"]
+    test "does not fetch unknown objects when fetch_remote is false" do
+      assert is_nil(
+               Object.normalize("http://mastodon.example.org/@admin/99541947525187367", false)
+             )
     end
   end
 end