X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fuser-subscriptions.ts;h=7d6b0c6a99684f7e45c264b07ece6f2077af2a82;hb=5600def4c87d3e6b7724489c9c4415778ea014d3;hp=c8a89d6be4653735f4f7514f504ef00128a53886;hpb=a41b9da1a9ce49df82ea10c82de4c2fbc6d1b189;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts index c8a89d6be..7d6b0c6a9 100644 --- a/server/tests/api/users/user-subscriptions.ts +++ b/server/tests/api/users/user-subscriptions.ts @@ -1,4 +1,4 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import * as chai from 'chai' import 'mocha' @@ -13,16 +13,17 @@ import { updateVideo, userLogin } from '../../../../shared/extra-utils' -import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index' +import { ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index' import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login' import { Video, VideoChannel } from '../../../../shared/models/videos' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { addUserSubscription, + areSubscriptionsExist, + getUserSubscription, listUserSubscriptions, listUserSubscriptionVideos, - removeUserSubscription, - getUserSubscription, areSubscriptionsExist + removeUserSubscription } from '../../../../shared/extra-utils/users/user-subscriptions' const expect = chai.expect @@ -102,7 +103,7 @@ describe('Test users subscriptions', function () { } { - const res = await listUserSubscriptions(servers[0].url, users[0].accessToken) + const res = await listUserSubscriptions(servers[0].url, users[0].accessToken, 'createdAt') expect(res.body.total).to.equal(2) const subscriptions: VideoChannel[] = res.body.data @@ -116,7 +117,7 @@ describe('Test users subscriptions', function () { it('Should get subscription', async function () { { - const res = await getUserSubscription(servers[ 0 ].url, users[ 0 ].accessToken, 'user3_channel@localhost:' + servers[2].port) + 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') @@ -127,7 +128,7 @@ describe('Test users subscriptions', function () { } { - const res = await getUserSubscription(servers[ 0 ].url, users[ 0 ].accessToken, 'root_channel@localhost:' + servers[0].port) + 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') @@ -146,7 +147,7 @@ describe('Test users subscriptions', function () { 'user3_channel@localhost:' + servers[0].port ] - const res = await areSubscriptionsExist(servers[ 0 ].url, users[ 0 ].accessToken, uris) + 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