aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-21 15:44:12 +0100
committerChocobozzz <me@florianbigard.com>2019-02-21 15:51:28 +0100
commitc8000975d361fae166a6ebecac5005238e14d4c9 (patch)
tree67d7da38abc6c4d9ceb4d120088d499309f69e30 /server
parente359e88b08476041c3c52db02fb3ca4e5ee296ea (diff)
downloadPeerTube-c8000975d361fae166a6ebecac5005238e14d4c9.tar.gz
PeerTube-c8000975d361fae166a6ebecac5005238e14d4c9.tar.zst
PeerTube-c8000975d361fae166a6ebecac5005238e14d4c9.zip
Add NSFW info in about page
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/activitypub/fetch.ts3
-rw-r--r--server/tests/api/activitypub/index.ts2
-rw-r--r--server/tests/api/activitypub/security.ts3
3 files changed, 7 insertions, 1 deletions
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index 03609c1a9..5c617de10 100644
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -3,6 +3,7 @@
3import 'mocha' 3import 'mocha'
4 4
5import { 5import {
6 closeAllSequelize,
6 createUser, 7 createUser,
7 doubleFollow, 8 doubleFollow,
8 flushAndRunMultipleServers, 9 flushAndRunMultipleServers,
@@ -79,6 +80,8 @@ describe('Test ActivityPub fetcher', function () {
79 after(async function () { 80 after(async function () {
80 killallServers(servers) 81 killallServers(servers)
81 82
83 await closeAllSequelize(servers)
84
82 // Keep the logs if the test failed 85 // Keep the logs if the test failed
83 if (this['ok']) { 86 if (this['ok']) {
84 await flushTests() 87 await flushTests()
diff --git a/server/tests/api/activitypub/index.ts b/server/tests/api/activitypub/index.ts
index 450053309..92bd6f660 100644
--- a/server/tests/api/activitypub/index.ts
+++ b/server/tests/api/activitypub/index.ts
@@ -1,5 +1,5 @@
1import './client' 1import './client'
2import './fetch' 2import './fetch'
3import './helpers'
4import './refresher' 3import './refresher'
4import './helpers'
5import './security' 5import './security'
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index 342ae0fa1..b78504073 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -3,6 +3,7 @@
3import 'mocha' 3import 'mocha'
4 4
5import { 5import {
6 closeAllSequelize,
6 flushAndRunMultipleServers, 7 flushAndRunMultipleServers,
7 flushTests, 8 flushTests,
8 killallServers, 9 killallServers,
@@ -179,6 +180,8 @@ describe('Test ActivityPub security', function () {
179 after(async function () { 180 after(async function () {
180 killallServers(servers) 181 killallServers(servers)
181 182
183 await closeAllSequelize(servers)
184
182 // Keep the logs if the test failed 185 // Keep the logs if the test failed
183 if (this['ok']) { 186 if (this['ok']) {
184 await flushTests() 187 await flushTests()