From f8388be9c69981958e9a96dce68fc39bdedb5cd3 Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 9 Feb 2019 22:01:08 +0100 Subject: Do object insertion through Cachex So we don't flood our postgres logs with errors. Should also make things slightly faster. --- test/object_test.exs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'test/object_test.exs') diff --git a/test/object_test.exs b/test/object_test.exs index 72194975d..ab6431012 100644 --- a/test/object_test.exs +++ b/test/object_test.exs @@ -57,4 +57,32 @@ defmodule Pleroma.ObjectTest do assert cached_object.data["type"] == "Tombstone" 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) + + Cachex.clear(:object_cache) + {:ok, third_object} = Object.insert_or_get(cng) + + assert object == second_object + assert object == third_object + end + end + + describe "create" do + test "inserts an object for a given data set" do + data = %{"id" => Ecto.UUID.generate()} + + {:ok, object} = Object.create(data) + assert object.data["id"] == data["id"] + + # Works when doing it twice. + {:ok, object} = Object.create(data) + assert object.data["id"] == data["id"] + end + end end -- cgit v1.2.3 From 8bb7e19b3814e261e66c2d3592d146f72d4ce623 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 10 Feb 2019 22:57:38 +0100 Subject: test: de-group alias/es --- test/object_test.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/object_test.exs') diff --git a/test/object_test.exs b/test/object_test.exs index ab6431012..9f5283d2d 100644 --- a/test/object_test.exs +++ b/test/object_test.exs @@ -5,7 +5,8 @@ defmodule Pleroma.ObjectTest do use Pleroma.DataCase import Pleroma.Factory - alias Pleroma.{Repo, Object} + alias Pleroma.Repo + alias Pleroma.Object test "returns an object by it's AP id" do object = insert(:note) -- cgit v1.2.3 From d53e36bf1e004177277cb5917bb290d512278aa9 Mon Sep 17 00:00:00 2001 From: lambda Date: Mon, 11 Feb 2019 08:07:39 +0000 Subject: Revert "Merge branch 'object-creation' into 'develop'" This reverts merge request !802 --- test/object_test.exs | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'test/object_test.exs') diff --git a/test/object_test.exs b/test/object_test.exs index ab6431012..72194975d 100644 --- a/test/object_test.exs +++ b/test/object_test.exs @@ -57,32 +57,4 @@ defmodule Pleroma.ObjectTest do assert cached_object.data["type"] == "Tombstone" 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) - - Cachex.clear(:object_cache) - {:ok, third_object} = Object.insert_or_get(cng) - - assert object == second_object - assert object == third_object - end - end - - describe "create" do - test "inserts an object for a given data set" do - data = %{"id" => Ecto.UUID.generate()} - - {:ok, object} = Object.create(data) - assert object.data["id"] == data["id"] - - # Works when doing it twice. - {:ok, object} = Object.create(data) - assert object.data["id"] == data["id"] - end - end end -- cgit v1.2.3