projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change user.approval_pending field to user.is_approved
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
poll_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/poll_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/poll_controller_test.exs
index f41de64485ec40bbe558dfeabf0f915da5c94806..95df48ab07eca75c2f022a748cdce4c1e9687b6a 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/poll_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/poll_controller_test.exs
@@
-1,9
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
poll: %{options: ["what Mastodon't", "n't what Mastodoes"], expires_in: 20}
})
poll: %{options: ["what Mastodon't", "n't what Mastodoes"], expires_in: 20}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
conn = get(conn, "/api/v1/polls/#{object.id}")
conn = get(conn, "/api/v1/polls/#{object.id}")
@@
-39,7
+39,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
visibility: "private"
})
visibility: "private"
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
conn = get(conn, "/api/v1/polls/#{object.id}")
conn = get(conn, "/api/v1/polls/#{object.id}")
@@
-63,7
+63,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
}
})
}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
conn =
conn
conn =
conn
@@
-85,7
+85,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
poll: %{options: ["Yes", "No"], expires_in: 20}
})
poll: %{options: ["Yes", "No"], expires_in: 20}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
assert conn
|> put_req_header("content-type", "application/json")
assert conn
|> put_req_header("content-type", "application/json")
@@
-106,7
+106,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
poll: %{options: ["half empty", "half full"], expires_in: 20}
})
poll: %{options: ["half empty", "half full"], expires_in: 20}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
assert conn
|> put_req_header("content-type", "application/json")
assert conn
|> put_req_header("content-type", "application/json")
@@
-129,7
+129,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
poll: %{options: ["Yes", "No"], expires_in: 20}
})
poll: %{options: ["Yes", "No"], expires_in: 20}
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
conn =
conn
conn =
conn
@@
-158,7
+158,7
@@
defmodule Pleroma.Web.MastodonAPI.PollControllerTest do
visibility: "private"
})
visibility: "private"
})
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
conn =
conn
conn =
conn