diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 14:05:34 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 14:05:34 +0300 |
| commit | 37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24 (patch) | |
| tree | 2e3f848e697426f4b79d8e02a2ba20df12368ca9 /test/support | |
| parent | 590c935d95f0ea4fb65994027a88a0623527af88 (diff) | |
| parent | 091baf93169895c62418ccee81b80d00416aaa56 (diff) | |
| download | pleroma-37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24.tar.gz pleroma-37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/factory.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/support/factory.ex b/test/support/factory.ex index 18f77f01a..e1a08315a 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -216,7 +216,7 @@ defmodule Pleroma.Factory do redirect_uris: "https://example.com/callback", scopes: ["read", "write", "follow", "push"], website: "https://example.com", - client_id: "aaabbb==", + client_id: Ecto.UUID.generate(), client_secret: "aaa;/&bbb" } end |