projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into openapi/account
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
marker_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/marker_controller_test.exs
b/test/web/mastodon_api/controllers/marker_controller_test.exs
index 5e7b4001f257e8009f16156f4e1af8aef1fdc11f..919f295bdfda940814326f4df9075b239e4bcb82 100644
(file)
--- a/
test/web/mastodon_api/controllers/marker_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/marker_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
{:ok, %{"notifications" => marker}} =
Pleroma.Marker.upsert(
user,
{:ok, %{"notifications" => marker}} =
Pleroma.Marker.upsert(
user,
- %{"notifications" => %{"last_read_id" => "69420"
, "unread_count" => 7
}}
+ %{"notifications" => %{"last_read_id" => "69420"}}
)
response =
)
response =
@@
-28,7
+28,6
@@
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
assert response == %{
"notifications" => %{
"last_read_id" => "69420",
assert response == %{
"notifications" => %{
"last_read_id" => "69420",
- "unread_count" => 7,
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
}
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
}
@@
-71,8
+70,7
@@
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
"notifications" => %{
"last_read_id" => "69420",
"updated_at" => _,
"notifications" => %{
"last_read_id" => "69420",
"updated_at" => _,
- "version" => 0,
- "unread_count" => 0
+ "version" => 0
}
} = response
end
}
} = response
end
@@
-100,7
+98,6
@@
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
assert response == %{
"notifications" => %{
"last_read_id" => "69888",
assert response == %{
"notifications" => %{
"last_read_id" => "69888",
- "unread_count" => 0,
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
}
"updated_at" => NaiveDateTime.to_iso8601(marker.updated_at),
"version" => 0
}