projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
views
/
poll_view_test.exs
diff --git
a/test/pleroma/web/mastodon_api/views/poll_view_test.exs
b/test/pleroma/web/mastodon_api/views/poll_view_test.exs
index b7e2f17eff9faf85af39ba109f1ff0bc964d493e..f83e5b368f796d9df2128d31600946f54ded257d 100644
(file)
--- a/
test/pleroma/web/mastodon_api/views/poll_view_test.exs
+++ b/
test/pleroma/web/mastodon_api/views/poll_view_test.exs
@@
-29,7
+29,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
}
})
}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
expected = %{
emojis: [],
expected = %{
emojis: [],
@@
-44,7
+44,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
],
voted: false,
votes_count: 0,
],
voted: false,
votes_count: 0,
- voters_count:
nil
+ voters_count:
0
}
result = PollView.render("show.json", %{object: object})
}
result = PollView.render("show.json", %{object: object})
@@
-72,7
+72,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
voter = insert(:user)
voter = insert(:user)
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
{:ok, _votes, object} = CommonAPI.vote(voter, object, [0, 1])
{:ok, _votes, object} = CommonAPI.vote(voter, object, [0, 1])
@@
-98,7
+98,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
}
})
}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
assert %{emojis: [%{shortcode: "blank"}]} = PollView.render("show.json", %{object: object})
end
assert %{emojis: [%{shortcode: "blank"}]} = PollView.render("show.json", %{object: object})
end
@@
-117,7
+117,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
}
})
}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
{:ok, _, object} = CommonAPI.vote(other_user, object, [1, 2])
{:ok, _, object} = CommonAPI.vote(other_user, object, [1, 2])
@@
-129,7
+129,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
end
test "does not crash on polls with no end date" do
end
test "does not crash on polls with no end date" do
- object = Object.normalize("https://skippers-bin.com/notes/7x9tmrp97i")
+ object = Object.normalize("https://skippers-bin.com/notes/7x9tmrp97i"
, fetch: true
)
result = PollView.render("show.json", %{object: object})
assert result[:expires_at] == nil
result = PollView.render("show.json", %{object: object})
assert result[:expires_at] == nil
@@
-153,7
+153,7
@@
defmodule Pleroma.Web.MastodonAPI.PollViewTest do
}
})
}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
assert %{
options: [
assert %{
options: [