squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix specs.

Browse Source
This commit is contained in:
Roger Braun 2017-10-31 17:57:26 +01:00
parent 44295dd49a
commit 0c871e5c6e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/web/mastodon_api/mastodon_api_controller_test.exs
View File

@ -91,7 +91,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> get("/api/v1/statuses/#{activity.id}") |> get("/api/v1/statuses/#{activity.id}")
assert %{"id" => id} = json_response(conn, 200) assert %{"id" => id} = json_response(conn, 200)
assert id == activity.id assert id == to_string(activity.id)
end end
describe "deleting a status" do describe "deleting a status" do
@ -132,7 +132,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> post("/api/v1/statuses/#{activity.id}/reblog") |> post("/api/v1/statuses/#{activity.id}/reblog")
assert %{"id" => id, "reblogged" => true, "reblogs_count" => 1} = json_response(conn, 200) assert %{"id" => id, "reblogged" => true, "reblogs_count" => 1} = json_response(conn, 200)
assert activity.id == id assert to_string(activity.id) == id
end end
end end
@ -146,7 +146,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> post("/api/v1/statuses/#{activity.id}/favourite") |> post("/api/v1/statuses/#{activity.id}/favourite")
assert %{"id" => id, "favourites_count" => 1, "favourited" => true} = json_response(conn, 200) assert %{"id" => id, "favourites_count" => 1, "favourited" => true} = json_response(conn, 200)
assert activity.id == id assert to_string(activity.id) == id
end end
end end
@ -162,7 +162,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> post("/api/v1/statuses/#{activity.id}/unfavourite") |> post("/api/v1/statuses/#{activity.id}/unfavourite")
assert %{"id" => id, "favourites_count" => 0, "favourited" => false} = json_response(conn, 200) assert %{"id" => id, "favourites_count" => 0, "favourited" => false} = json_response(conn, 200)
assert activity.id == id assert to_string(activity.id) == id
end end
end end
@ -178,7 +178,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert [%{"id" => id}] = json_response(conn, 200) assert [%{"id" => id}] = json_response(conn, 200)
assert id == note_two.id assert id == to_string(note_two.id)
end end
end end
@ -238,7 +238,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert [%{"id" => id}] = json_response(conn, 200) assert [%{"id" => id}] = json_response(conn, 200)
assert id == activity.id assert id == to_string(activity.id)
end end
test "getting followers", %{conn: conn} do test "getting followers", %{conn: conn} do
@ -351,7 +351,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert results["hashtags"] == [] assert results["hashtags"] == []
[status] = results["statuses"] [status] = results["statuses"]
assert status["id"] == activity.id assert status["id"] == to_string(activity.id)
end end
test "search fetches remote accounts", %{conn: conn} do test "search fetches remote accounts", %{conn: conn} do
@ -377,6 +377,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> get("/api/v1/favourites") |> get("/api/v1/favourites")
assert [status] = json_response(conn, 200) assert [status] = json_response(conn, 200)
assert status["id"] == activity.id assert status["id"] == to_string(activity.id)
end end
end end

2
test/web/twitter_api/twitter_api_test.exs
View File

@ -365,7 +365,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{:ok, represented} = TwitterAPI.get_external_profile(user, id) {:ok, represented} = TwitterAPI.get_external_profile(user, id)
remote = User.get_by_ap_id(id) remote = User.get_by_ap_id(id)
assert represented == UserView.render("show.json", %{user: remote, for: user}) assert represented["id"] == UserView.render("show.json", %{user: remote, for: user})["id"]
# Also fetches the feed. # Also fetches the feed.
assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status") assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status")