Fix tests
This commit is contained in:
parent
8add119444
commit
bc7862106d
4 changed files with 4 additions and 30 deletions
|
@ -55,7 +55,6 @@ defmodule Pleroma.User do
|
||||||
field(:tags, {:array, :string}, default: [])
|
field(:tags, {:array, :string}, default: [])
|
||||||
field(:bookmarks, {:array, :string}, default: [])
|
field(:bookmarks, {:array, :string}, default: [])
|
||||||
field(:last_refreshed_at, :naive_datetime_usec)
|
field(:last_refreshed_at, :naive_datetime_usec)
|
||||||
field(:current_sign_in_at, :naive_datetime)
|
|
||||||
field(:last_digest_emailed_at, :naive_datetime)
|
field(:last_digest_emailed_at, :naive_datetime)
|
||||||
has_many(:notifications, Notification)
|
has_many(:notifications, Notification)
|
||||||
has_many(:registrations, Registration)
|
has_many(:registrations, Registration)
|
||||||
|
|
|
@ -6,7 +6,6 @@ defmodule Pleroma.NotificationTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
import Mock
|
|
||||||
|
|
||||||
alias Pleroma.Notification
|
alias Pleroma.Notification
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
|
@ -303,32 +302,6 @@ test "it sets all notifications as read up to a specified notification ID" do
|
||||||
assert n2.seen == true
|
assert n2.seen == true
|
||||||
assert n3.seen == false
|
assert n3.seen == false
|
||||||
end
|
end
|
||||||
|
|
||||||
test "Updates `updated_at` field" do
|
|
||||||
user1 = insert(:user)
|
|
||||||
user2 = insert(:user)
|
|
||||||
|
|
||||||
Enum.each(0..10, fn i ->
|
|
||||||
{:ok, _activity} =
|
|
||||||
TwitterAPI.create_status(user1, %{
|
|
||||||
"status" => "#{i} hi @#{user2.nickname}"
|
|
||||||
})
|
|
||||||
end)
|
|
||||||
|
|
||||||
[notification | _] = Notification.for_user(user2)
|
|
||||||
|
|
||||||
utc_now = NaiveDateTime.utc_now()
|
|
||||||
future = NaiveDateTime.add(utc_now, 5, :second)
|
|
||||||
|
|
||||||
with_mock NaiveDateTime, utc_now: fn -> future end do
|
|
||||||
Notification.set_read_up_to(user2, notification.id)
|
|
||||||
|
|
||||||
Notification.for_user(user2)
|
|
||||||
|> Enum.each(fn notification ->
|
|
||||||
assert notification.updated_at > notification.inserted_at
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "for_user_since/2" do
|
describe "for_user_since/2" do
|
||||||
|
|
|
@ -9,7 +9,8 @@ def build(data \\ %{}) do
|
||||||
nickname: "testname",
|
nickname: "testname",
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
||||||
bio: "A tester.",
|
bio: "A tester.",
|
||||||
ap_id: "some id"
|
ap_id: "some id",
|
||||||
|
last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)
|
||||||
}
|
}
|
||||||
|
|
||||||
Map.merge(user, data)
|
Map.merge(user, data)
|
||||||
|
|
|
@ -12,7 +12,8 @@ def user_factory do
|
||||||
nickname: sequence(:nickname, &"nick#{&1}"),
|
nickname: sequence(:nickname, &"nick#{&1}"),
|
||||||
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
|
||||||
bio: sequence(:bio, &"Tester Number #{&1}"),
|
bio: sequence(:bio, &"Tester Number #{&1}"),
|
||||||
info: %{}
|
info: %{},
|
||||||
|
last_digest_emailed_at: NaiveDateTime.utc_now()
|
||||||
}
|
}
|
||||||
|
|
||||||
%{
|
%{
|
||||||
|
|
Loading…
Reference in a new issue