aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-04-20 09:04:38 +0200
committerChocobozzz <me@florianbigard.com>2020-04-20 09:04:38 +0200
commit0dd57e4d43b06a70a45b77f2006f805f9a42116c (patch)
tree3710e623be565c6a8d4293fe6ed2c585968c53e8 /server
parent7a9f9c46261062fb7b718395a8f71c1b742764d4 (diff)
downloadPeerTube-0dd57e4d43b06a70a45b77f2006f805f9a42116c.tar.gz
PeerTube-0dd57e4d43b06a70a45b77f2006f805f9a42116c.tar.zst
PeerTube-0dd57e4d43b06a70a45b77f2006f805f9a42116c.zip
Fix tests
Diffstat (limited to 'server')
-rw-r--r--server/lib/job-queue/handlers/activitypub-follow.ts2
-rw-r--r--server/tests/api/notifications/user-notifications.ts19
2 files changed, 11 insertions, 10 deletions
diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts
index 94eeed4c0..e467c5b1b 100644
--- a/server/lib/job-queue/handlers/activitypub-follow.ts
+++ b/server/lib/job-queue/handlers/activitypub-follow.ts
@@ -36,7 +36,7 @@ async function processActivityPubFollow (job: Bull.Job) {
36 } 36 }
37 37
38 if (payload.assertIsChannel && !targetActor.VideoChannel) { 38 if (payload.assertIsChannel && !targetActor.VideoChannel) {
39 logger.warn('Do not follow %s@%s because it is not a channel.', name, host) 39 logger.warn('Do not follow %s@%s because it is not a channel.', payload.name, host)
40 return 40 return
41 } 41 }
42 42
diff --git a/server/tests/api/notifications/user-notifications.ts b/server/tests/api/notifications/user-notifications.ts
index 625e344fa..3c9c7fe31 100644
--- a/server/tests/api/notifications/user-notifications.ts
+++ b/server/tests/api/notifications/user-notifications.ts
@@ -1024,15 +1024,16 @@ describe('Test users notifications', function () {
1024 await removeUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:' + servers[0].port) 1024 await removeUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:' + servers[0].port)
1025 }) 1025 })
1026 1026
1027 it('Should notify when a local account is following one of our channel', async function () { 1027 // PeerTube does not support accout -> account follows
1028 this.timeout(10000) 1028 // it('Should notify when a local account is following one of our channel', async function () {
1029 1029 // this.timeout(10000)
1030 await addUserSubscription(servers[0].url, servers[0].accessToken, 'user_1@localhost:' + servers[0].port) 1030 //
1031 1031 // await addUserSubscription(servers[0].url, servers[0].accessToken, 'user_1@localhost:' + servers[0].port)
1032 await waitJobs(servers) 1032 //
1033 1033 // await waitJobs(servers)
1034 await checkNewActorFollow(baseParams, 'account', 'root', 'super root name', myUserName, 'presence') 1034 //
1035 }) 1035 // await checkNewActorFollow(baseParams, 'account', 'root', 'super root name', myUserName, 'presence')
1036 // })
1036 1037
1037 it('Should notify when a remote account is following one of our channel', async function () { 1038 it('Should notify when a remote account is following one of our channel', async function () {
1038 this.timeout(10000) 1039 this.timeout(10000)