diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:36:57 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:36:57 +0000 |
| commit | 74eba5afe20124646366aace98c2e1b106712108 (patch) | |
| tree | 6a22783bec4d01c9d2a7624c14f7b064178cc38b | |
| parent | 2990c0a53b14646eab19b57d068ac8aa7e17ea4e (diff) | |
| parent | ca88e37a8f3b0b52771f94df676e26471fb44019 (diff) | |
| download | pleroma-74eba5afe20124646366aace98c2e1b106712108.tar.gz pleroma-74eba5afe20124646366aace98c2e1b106712108.zip | |
Merge branch 'fix/race-in-tests' into 'develop'
Fix a race condition in tests
See merge request pleroma/pleroma!1673
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 9c5322ccb..fb04748bb 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -752,7 +752,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do query_string = "ids[]=#{id1}&ids[]=#{id2}" conn = get(conn, "/api/v1/statuses/?#{query_string}") - assert [%{"id" => ^id1}, %{"id" => ^id2}] = json_response(conn, :ok) + assert [%{"id" => ^id1}, %{"id" => ^id2}] = Enum.sort_by(json_response(conn, :ok), & &1["id"]) end describe "deleting a status" do |