X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fuser-subscriptions.ts;h=48811e647d172606b4db54aee8fce30270dd8212;hb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;hp=037a79a76d57576f354466d72785769efe0726f9;hpb=1eddc9a74f9a80fa5d0cb25fceb3fc47a1a3c14a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts index 037a79a76..48811e647 100644 --- a/server/tests/api/users/user-subscriptions.ts +++ b/server/tests/api/users/user-subscriptions.ts @@ -3,6 +3,7 @@ import * as chai from 'chai' import 'mocha' import { + cleanupTests, createUser, doubleFollow, flushAndRunMultipleServers, @@ -11,18 +12,18 @@ import { unfollow, updateVideo, userLogin -} from '../../../../shared/utils' -import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/utils/index' -import { setAccessTokensToServers } from '../../../../shared/utils/users/login' +} from '../../../../shared/extra-utils' +import { killallServers, 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/utils/server/jobs' +import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { addUserSubscription, listUserSubscriptions, listUserSubscriptionVideos, removeUserSubscription, getUserSubscription, areSubscriptionsExist -} from '../../../../shared/utils/users/user-subscriptions' +} from '../../../../shared/extra-utils/users/user-subscriptions' const expect = chai.expect @@ -369,6 +370,6 @@ describe('Test users subscriptions', function () { }) after(async function () { - killallServers(servers) + await cleanupTests(servers) }) })