diff options
| author | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
| commit | 1bfd8528bbc71c8c34253eb245de7df498064fb4 (patch) | |
| tree | 97387260c85bb6b5505924de806110d8f71eb3fc /test/pleroma/web/mastodon_api/controllers/status_controller_test.exs | |
| parent | 18a91d85e59eb67a2d58a28aae732c34b75ebe97 (diff) | |
| parent | 5aff4799515c141cb0a42686733b2f40faba6f86 (diff) | |
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/pleroma/web/mastodon_api/controllers/status_controller_test.exs')
| -rw-r--r-- | test/pleroma/web/mastodon_api/controllers/status_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs index 4acf7a18e..ddddd0ea0 100644 --- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs @@ -937,7 +937,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do |> get("/api/v1/statuses/#{reblog_activity1.id}") assert %{ - "reblog" => %{"id" => id, "reblogged" => false, "reblogs_count" => 2}, + "reblog" => %{"id" => _id, "reblogged" => false, "reblogs_count" => 2}, "reblogged" => false, "favourited" => false, "bookmarked" => false |