From 47d883d3abb4d64721b2a8ed925021dfeeaa4459 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:06:02 +0100 Subject: Fix User deactivation. --- test/user_test.exs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index 231f1d94d..d6a3c9979 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -489,11 +489,11 @@ defmodule Pleroma.UserTest do test ".deactivate can de-activate then re-activate a user" do user = insert(:user) - assert false == !!user.info["deactivated"] + assert false == user.info.deactivated {:ok, user} = User.deactivate(user) - assert true == user.info["deactivated"] + assert true == user.info.deactivated {:ok, user} = User.deactivate(user, false) - assert false == !!user.info["deactivated"] + assert false == user.info.deactivated end test ".delete deactivates a user, all follow relationships and all create activities" do -- cgit v1.2.3 From 5c8f07f0a8594204ab45a7db262db09b71f94574 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:17:56 +0100 Subject: Fix note counting. --- test/user_test.exs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index d6a3c9979..340878f64 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -322,34 +322,34 @@ defmodule Pleroma.UserTest do note = insert(:note) user = User.get_by_ap_id(note.data["actor"]) - assert user.info["note_count"] == nil + assert user.info.note_count == 0 {:ok, user} = User.increase_note_count(user) - assert user.info["note_count"] == 1 + assert user.info.note_count == 1 {:ok, user} = User.increase_note_count(user) - assert user.info["note_count"] == 2 + assert user.info.note_count == 2 end test "it decreases the info->note_count property" do note = insert(:note) user = User.get_by_ap_id(note.data["actor"]) - assert user.info["note_count"] == nil + assert user.info.note_count == 0 {:ok, user} = User.increase_note_count(user) - assert user.info["note_count"] == 1 + assert user.info.note_count == 1 {:ok, user} = User.decrease_note_count(user) - assert user.info["note_count"] == 0 + assert user.info.note_count == 0 {:ok, user} = User.decrease_note_count(user) - assert user.info["note_count"] == 0 + assert user.info.note_count == 0 end test "it sets the info->follower_count property" do -- cgit v1.2.3 From 8e3d8bde04bc3a6f82b501a39df12a672f0f7141 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:40:58 +0100 Subject: Fix user deactivation test. --- test/user_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index 340878f64..6ef88e492 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -41,7 +41,7 @@ defmodule Pleroma.UserTest do test "can't follow a deactivated users" do user = insert(:user) - followed = insert(:user, info: %{"deactivated" => true}) + followed = insert(:user, info: %{deactivated: true}) {:error, _} = User.follow(user, followed) end -- cgit v1.2.3 From 6f90ceb2eda68c5541a584d46868de748077c85d Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:46:04 +0100 Subject: Fix follower count test. --- test/user_test.exs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index 6ef88e492..fdc908dcd 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -34,7 +34,7 @@ defmodule Pleroma.UserTest do user = Repo.get(User, user.id) followed = User.get_by_ap_id(followed.ap_id) - assert followed.info["follower_count"] == 1 + assert followed.info.follower_count == 1 assert User.ap_followers(followed) in user.following end @@ -358,11 +358,11 @@ defmodule Pleroma.UserTest do User.follow(follower, user) - assert user.info["follower_count"] == nil + assert user.info.follower_count == 0 {:ok, user} = User.update_follower_count(user) - assert user.info["follower_count"] == 1 + assert user.info.follower_count == 1 end end @@ -517,7 +517,7 @@ defmodule Pleroma.UserTest do follower = Repo.get(User, follower.id) user = Repo.get(User, user.id) - assert user.info["deactivated"] + assert user.info.deactivated refute User.following?(user, followed) refute User.following?(followed, follower) -- cgit v1.2.3 From d5af41b577c773ab6c3918d395ff4973a017a797 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:52:21 +0100 Subject: Fix note count update. --- test/user_test.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index fdc908dcd..3d330b963 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -311,11 +311,11 @@ defmodule Pleroma.UserTest do user = User.get_by_ap_id(note.data["actor"]) - assert user.info["note_count"] == nil + assert user.info.note_count == 0 {:ok, user} = User.update_note_count(user) - assert user.info["note_count"] == 1 + assert user.info.note_count == 1 end test "it increases the info->note_count property" do -- cgit v1.2.3 From fc3bcf335e2c5ba1f8b1b25c1a4869cefff2a431 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 18:53:50 +0100 Subject: Fix following locked users. --- test/user_test.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index 3d330b963..f37f4521d 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -56,8 +56,8 @@ defmodule Pleroma.UserTest do end test "local users do not automatically follow local locked accounts" do - follower = insert(:user, info: %{"locked" => true}) - followed = insert(:user, info: %{"locked" => true}) + follower = insert(:user, info: %{locked: true}) + followed = insert(:user, info: %{locked: true}) {:ok, follower} = User.maybe_direct_follow(follower, followed) -- cgit v1.2.3 From 40d9d2098c85f1a8a6a5ff2b17adc78bbba3fd6c Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 18 Nov 2018 22:15:03 +0100 Subject: Fix user updating from AP. --- test/user_test.exs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index f37f4521d..f345f001f 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -185,12 +185,14 @@ defmodule Pleroma.UserTest do local: false, nickname: "admin@mastodon.example.org", ap_id: "http://mastodon.example.org/users/admin", - last_refreshed_at: a_week_ago + last_refreshed_at: a_week_ago, + info: %{} ) assert orig_user.last_refreshed_at == a_week_ago user = User.get_or_fetch_by_ap_id("http://mastodon.example.org/users/admin") + assert user.info.source_data["endpoints"] refute user.last_refreshed_at == orig_user.last_refreshed_at end -- cgit v1.2.3 From f18b86fd5f01653dd6e860b2d67021bdce684d6d Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 1 Dec 2018 12:46:08 +0100 Subject: More fixes for Info schema. --- test/user_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index f345f001f..62104df90 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -548,7 +548,7 @@ defmodule Pleroma.UserTest do end test "html_filter_policy returns TwitterText scrubber when rich-text is disabled" do - user = insert(:user, %{info: %{"no_rich_text" => true}}) + user = insert(:user, %{info: %{no_rich_text: true}}) assert Pleroma.HTML.Scrubber.TwitterText == User.html_filter_policy(user) end -- cgit v1.2.3 From a9e4a975866c33553c477667c431187590329447 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Tue, 4 Dec 2018 14:01:39 +0300 Subject: update test --- test/user_test.exs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index 62104df90..d097eb171 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -9,6 +9,11 @@ defmodule Pleroma.UserTest do import Pleroma.Factory import Ecto.Query + setup_all do + Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) + :ok + end + test "ap_id returns the activity pub id for the user" do user = UserBuilder.build() -- cgit v1.2.3 From 0f061bea0c217de8560ca235500959a463dd17ef Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 5 Dec 2018 03:41:32 +0000 Subject: tests: add regression test for bug #408 --- test/user_test.exs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test/user_test.exs') diff --git a/test/user_test.exs b/test/user_test.exs index d097eb171..3d2f7f4e0 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -149,6 +149,18 @@ defmodule Pleroma.UserTest do assert changeset.changes.follower_address == "#{changeset.changes.ap_id}/followers" end + + test "it ensures info is not nil" do + changeset = User.register_changeset(%User{}, @full_user_data) + + assert changeset.valid? + + {:ok, user} = + changeset + |> Repo.insert() + + refute is_nil(user.info) + end end describe "fetching a user from nickname or trying to build one" do -- cgit v1.2.3