diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-11-10 17:18:19 +0100 | 
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-11-10 17:18:19 +0100 | 
| commit | 6e9c22c0afaa67f0b94f602eceef5c57b7c9192f (patch) | |
| tree | 18dc2e310f811a5f1b9fd175574c96378ac279a2 /test/web | |
| parent | f1d27a5fbbe547a78f835bd65b43a652004d708e (diff) | |
| download | pleroma-6e9c22c0afaa67f0b94f602eceef5c57b7c9192f.tar.gz pleroma-6e9c22c0afaa67f0b94f602eceef5c57b7c9192f.zip | |
MastoAPI: Use string ids everywhere.
Diffstat (limited to 'test/web')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 6 | ||||
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 20 | 
2 files changed, 13 insertions, 13 deletions
| diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index c62cb4f36..eccfe0b36 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -8,7 +8,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do      user = insert(:user, %{info: %{"note_count" => 5, "follower_count" => 3}, nickname: "shp@shitposter.club", inserted_at: ~N[2017-08-15 15:47:06.597036]})      expected = %{ -      id: user.id, +      id: to_string(user.id),        username: "shp",        acct: user.nickname,        display_name: user.name, @@ -37,7 +37,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do      user = insert(:user)      expected = %{ -      id: user.id, +      id: to_string(user.id),        acct: user.nickname,        username: user.nickname,        url: user.ap_id @@ -54,7 +54,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do      {:ok, user} = User.block(user, other_user)      expected = %{ -      id: other_user.id, +      id: to_string(other_user.id),        following: true,        followed_by: false,        blocking: true, diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index d118026eb..72ce77c81 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -81,7 +81,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> get("/api/v1/accounts/verify_credentials")      assert %{"id" => id} = json_response(conn, 200) -    assert id == user.id +    assert id == to_string(user.id)    end    test "get a status", %{conn: conn} do @@ -194,7 +194,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do        assert [relationship] = json_response(conn, 200) -      assert other_user.id == relationship["id"] +      assert to_string(other_user.id) == relationship["id"]      end    end @@ -205,7 +205,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> get("/api/v1/accounts/#{user.id}")      assert %{"id" => id} = json_response(conn, 200) -    assert id == user.id +    assert id == to_string(user.id)      conn = build_conn()      |> get("/api/v1/accounts/-1") @@ -250,7 +250,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> get("/api/v1/accounts/#{other_user.id}/followers")      assert [%{"id" => id}] = json_response(conn, 200) -    assert id = user.id +    assert id == to_string(user.id)    end    test "getting following", %{conn: conn} do @@ -262,7 +262,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> get("/api/v1/accounts/#{user.id}/following")      assert [%{"id" => id}] = json_response(conn, 200) -    assert id = other_user.id +    assert id == to_string(other_user.id)    end    test "following / unfollowing a user", %{conn: conn} do @@ -288,7 +288,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> post("/api/v1/follows", %{"uri" => other_user.nickname})      assert %{"id" => id} = json_response(conn, 200) -    assert id == other_user.id +    assert id == to_string(other_user.id)    end    test "blocking / unblocking a user", %{conn: conn} do @@ -319,7 +319,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> assign(:user, user)      |> get("/api/v1/blocks") -    other_user_id = other_user.id +    other_user_id = to_string(other_user.id)      assert [%{"id" => ^other_user_id}] = json_response(conn, 200)    end @@ -334,7 +334,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do        |> post("/api/v1/accounts/#{other_user.id}/#{endpoint}")        assert %{"id" => id} = json_response(conn, 200) -      assert id == other_user.id +      assert id == to_string(other_user.id)      end)    end @@ -361,7 +361,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      |> get("/api/v1/accounts/search", %{"q" => "2hu"})      assert [account] = json_response(conn, 200) -    assert account["id"] == user_three.id +    assert account["id"] == to_string(user_three.id)    end    test "search", %{conn: conn} do @@ -378,7 +378,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do      assert results = json_response(conn, 200)      [account] = results["accounts"] -    assert account["id"] == user_three.id +    assert account["id"] == to_string(user_three.id)      assert results["hashtags"] == [] | 
