diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-02 13:03:33 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-02 13:03:33 +0300 |
| commit | badd0a96eaa9ff8fca7d25eccd05e8428e132699 (patch) | |
| tree | 0c6a441f993935525bc4a706e98c8e36e11e7b10 /config/test.exs | |
| parent | ead2d18826cf446fd7da542c55b6601e9bfc001c (diff) | |
| parent | ee0c40831efde5054f587ae0e371fffcad1396b7 (diff) | |
| download | pleroma-badd0a96eaa9ff8fca7d25eccd05e8428e132699.tar.gz pleroma-badd0a96eaa9ff8fca7d25eccd05e8428e132699.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index d52ced612..5c66a36f1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -95,6 +95,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, :modules, runtime_dir: "test/fixtures/modules" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |