[#468] Merged upstream/develop.
This commit is contained in:
commit
c0ecbf6669
39 changed files with 775 additions and 210 deletions
|
|
@ -227,4 +227,17 @@ defmodule Pleroma.Factory do
|
|||
unreachable_since: nil
|
||||
}
|
||||
end
|
||||
|
||||
def oauth_token_factory do
|
||||
user = insert(:user)
|
||||
oauth_app = insert(:oauth_app)
|
||||
|
||||
%Pleroma.Web.OAuth.Token{
|
||||
token: :crypto.strong_rand_bytes(32) |> Base.url_encode64(),
|
||||
refresh_token: :crypto.strong_rand_bytes(32) |> Base.url_encode64(),
|
||||
user_id: user.id,
|
||||
app_id: oauth_app.id,
|
||||
valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10)
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
19
test/support/jobs_worker_mock.ex
Normal file
19
test/support/jobs_worker_mock.ex
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Pleroma: A lightweight social networking server
|
||||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
defmodule Pleroma.Jobs.WorkerMock do
|
||||
require Logger
|
||||
|
||||
def perform(:test_job, arg, arg2) do
|
||||
Logger.debug({:perform, :test_job, arg, arg2})
|
||||
end
|
||||
|
||||
def perform(:test_job, payload) do
|
||||
Logger.debug({:perform, :test_job, payload})
|
||||
end
|
||||
|
||||
def test_job(payload) do
|
||||
Pleroma.Jobs.enqueue(:testing, __MODULE__, [:test_job, payload])
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue