Merge branch 'feature/1584-client-captcha-options' into 'develop'

Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00 · 2020-04-17 09:19:35 +00:00 · a17bfb5fab
commit a17bfb5fab
parent d8142ee6fe a6ee6784bc
15 changed files with 678 additions and 3 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -294,7 +294,7 @@ defmodule Pleroma.Factory do

  def oauth_app_factory do
    %Pleroma.Web.OAuth.App{
-      client_name: "Some client",
+      client_name: sequence(:client_name, &"Some client #{&1}"),
      redirect_uris: "https://example.com/callback",
      scopes: ["read", "write", "follow", "push", "admin"],
      website: "https://example.com",