X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fuser-subscriptions.ts;h=7e365d7972b2a149f09247f7179095cf079e0e8f;hb=c3d29f694bf8c910f917be655626d0f80871124f;hp=cb7d94b0b9aff80a983cc93f83626c672945802e;hpb=f6eebcb336c067e160a62020a5140d8d992ba384;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index cb7d94b0b..7e365d797 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -1,19 +1,27 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-import { createUser, doubleFollow, flushAndRunMultipleServers, follow, getVideosList, unfollow, updateVideo, userLogin } from '../../utils'
-import { killallServers, ServerInfo, uploadVideo } from '../../utils/index'
-import { setAccessTokensToServers } from '../../utils/users/login'
-import { Video, VideoChannel } from '../../../../shared/models/videos'
-import { waitJobs } from '../../utils/server/jobs'
+import * as chai from 'chai'
 import {
   addUserSubscription,
+  areSubscriptionsExist,
+  cleanupTests,
+  createUser,
+  doubleFollow,
+  flushAndRunMultipleServers,
+  getUserSubscription,
+  getVideosList,
   listUserSubscriptions,
   listUserSubscriptionVideos,
   removeUserSubscription,
-  getUserSubscription
-} from '../../utils/users/user-subscriptions'
+  ServerInfo,
+  setAccessTokensToServers,
+  updateVideo,
+  uploadVideo,
+  userLogin,
+  waitJobs
+} from '@shared/extra-utils'
+import { Video, VideoChannel } from '@shared/models'
 
 const expect = chai.expect
 
@@ -36,7 +44,7 @@ describe('Test users subscriptions', function () {
     {
       for (const server of servers) {
         const user = { username: 'user' + server.serverNumber, password: 'password' }
-        await createUser(server.url, server.accessToken, user.username, user.password)
+        await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
 
         const accessToken = await userLogin(server, user)
         users.push({ accessToken })
@@ -61,8 +69,8 @@ describe('Test users subscriptions', function () {
   it('User of server 1 should follow user of server 3 and root of server 1', async function () {
     this.timeout(60000)
 
-    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
-    await addUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:9001')
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:' + servers[2].port)
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:' + servers[0].port)
 
     await waitJobs(servers)
 
@@ -85,14 +93,14 @@ describe('Test users subscriptions', function () {
 
   it('Should list subscriptions', async function () {
     {
-      const res = await listUserSubscriptions(servers[0].url, servers[0].accessToken)
+      const res = await listUserSubscriptions({ url: servers[0].url, token: servers[0].accessToken })
       expect(res.body.total).to.equal(0)
       expect(res.body.data).to.be.an('array')
       expect(res.body.data).to.have.lengthOf(0)
     }
 
     {
-      const res = await listUserSubscriptions(servers[0].url, users[0].accessToken)
+      const res = await listUserSubscriptions({ url: servers[0].url, token: users[0].accessToken, sort: 'createdAt' })
       expect(res.body.total).to.equal(2)
 
       const subscriptions: VideoChannel[] = res.body.data
@@ -106,28 +114,73 @@ describe('Test users subscriptions', function () {
 
   it('Should get subscription', async function () {
     {
-      const res = await getUserSubscription(servers[ 0 ].url, users[ 0 ].accessToken, 'user3_channel@localhost:9003')
+      const res = await getUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:' + servers[2].port)
       const videoChannel: VideoChannel = res.body
 
       expect(videoChannel.name).to.equal('user3_channel')
-      expect(videoChannel.host).to.equal('localhost:9003')
+      expect(videoChannel.host).to.equal('localhost:' + servers[2].port)
       expect(videoChannel.displayName).to.equal('Main user3 channel')
       expect(videoChannel.followingCount).to.equal(0)
       expect(videoChannel.followersCount).to.equal(1)
     }
 
     {
-      const res = await getUserSubscription(servers[ 0 ].url, users[ 0 ].accessToken, 'root_channel@localhost:9001')
+      const res = await getUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:' + servers[0].port)
       const videoChannel: VideoChannel = res.body
 
       expect(videoChannel.name).to.equal('root_channel')
-      expect(videoChannel.host).to.equal('localhost:9001')
+      expect(videoChannel.host).to.equal('localhost:' + servers[0].port)
       expect(videoChannel.displayName).to.equal('Main root channel')
       expect(videoChannel.followingCount).to.equal(0)
       expect(videoChannel.followersCount).to.equal(1)
     }
   })
 
+  it('Should return the existing subscriptions', async function () {
+    const uris = [
+      'user3_channel@localhost:' + servers[2].port,
+      'root2_channel@localhost:' + servers[0].port,
+      'root_channel@localhost:' + servers[0].port,
+      'user3_channel@localhost:' + servers[0].port
+    ]
+
+    const res = await areSubscriptionsExist(servers[0].url, users[0].accessToken, uris)
+    const body = res.body
+
+    expect(body['user3_channel@localhost:' + servers[2].port]).to.be.true
+    expect(body['root2_channel@localhost:' + servers[0].port]).to.be.false
+    expect(body['root_channel@localhost:' + servers[0].port]).to.be.true
+    expect(body['user3_channel@localhost:' + servers[0].port]).to.be.false
+  })
+
+  it('Should search among subscriptions', async function () {
+    {
+      const res = await listUserSubscriptions({
+        url: servers[0].url,
+        token: users[0].accessToken,
+        sort: '-createdAt',
+        search: 'user3_channel'
+      })
+      expect(res.body.total).to.equal(1)
+
+      const subscriptions = res.body.data
+      expect(subscriptions).to.have.lengthOf(1)
+    }
+
+    {
+      const res = await listUserSubscriptions({
+        url: servers[0].url,
+        token: users[0].accessToken,
+        sort: '-createdAt',
+        search: 'toto'
+      })
+      expect(res.body.total).to.equal(0)
+
+      const subscriptions = res.body.data
+      expect(subscriptions).to.have.lengthOf(0)
+    }
+  })
+
   it('Should list subscription videos', async function () {
     {
       const res = await listUserSubscriptionVideos(servers[0].url, servers[0].accessToken)
@@ -194,7 +247,7 @@ describe('Test users subscriptions', function () {
   it('Should have server 1 follow server 3 and display server 3 videos', async function () {
     this.timeout(60000)
 
-    await follow(servers[0].url, [ servers[2].url ], servers[0].accessToken)
+    await servers[0].followsCommand.follow({ targets: [ servers[2].url ] })
 
     await waitJobs(servers)
 
@@ -212,7 +265,7 @@ describe('Test users subscriptions', function () {
   it('Should remove follow server 1 -> server 3 and hide server 3 videos', async function () {
     this.timeout(60000)
 
-    await unfollow(servers[0].url, servers[0].accessToken, servers[2])
+    await servers[0].followsCommand.unfollow({ target: servers[2] })
 
     await waitJobs(servers)
 
@@ -264,7 +317,7 @@ describe('Test users subscriptions', function () {
   it('Should remove user of server 3 subscription', async function () {
     this.timeout(30000)
 
-    await removeUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
+    await removeUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:' + servers[2].port)
 
     await waitJobs(servers)
   })
@@ -285,7 +338,7 @@ describe('Test users subscriptions', function () {
   it('Should remove the root subscription and not display the videos anymore', async function () {
     this.timeout(30000)
 
-    await removeUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:9001')
+    await removeUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:' + servers[0].port)
 
     await waitJobs(servers)
 
@@ -313,7 +366,7 @@ describe('Test users subscriptions', function () {
   it('Should follow user of server 3 again', async function () {
     this.timeout(60000)
 
-    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:' + servers[2].port)
 
     await waitJobs(servers)
 
@@ -343,6 +396,6 @@ describe('Test users subscriptions', function () {
   })
 
   after(async function () {
-    killallServers(servers)
+    await cleanupTests(servers)
   })
 })