From: buoyantair <buoyantair@protonmail.com>
Date: Sun, 18 Nov 2018 16:25:52 +0000 (+0530)
Subject: Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils... 
X-Git-Tag: v1.2.0-rc.1~88^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13;p=oweals%2Fpeertube.git

Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
---

b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13
diff --cc server/tests/api/check-params/user-subscriptions.ts
index 2cf5a2415,6af7ed43b..8a9ced7c1
--- a/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@@ -13,12 -13,9 +13,14 @@@ import 
    ServerInfo,
    setAccessTokensToServers,
    userLogin
 -} from '../../utils'
 -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
 -import { waitJobs } from '../../utils/server/jobs'
 +} from '../../../../shared/utils'
++
 +import {
 +  checkBadCountPagination,
 +  checkBadSortPagination,
 +  checkBadStartPagination
 +} from '../../../../shared/utils/requests/check-api-params'
++import { waitJobs } from '../../../../shared/utils/server/jobs'
  
  describe('Test user subscriptions API validators', function () {
    const path = '/api/v1/users/me/subscriptions'
diff --cc server/tests/api/redundancy/redundancy.ts
index 663e31ead,a8a2f305f..2bc1b60ce
--- a/server/tests/api/redundancy/redundancy.ts
+++ b/server/tests/api/redundancy/redundancy.ts
@@@ -17,11 -17,11 +17,12 @@@ import 
    viewVideo,
    wait,
    waitUntilLog,
-   checkVideoFilesWereRemoved, removeVideo
+   checkVideoFilesWereRemoved, removeVideo, getVideoWithToken
 -} from '../../utils'
 -import { waitJobs } from '../../utils/server/jobs'
 +} from '../../../../shared/utils'
 +import { waitJobs } from '../../../../shared/utils/server/jobs'
++
  import * as magnetUtil from 'magnet-uri'
 -import { updateRedundancy } from '../../utils/server/redundancy'
 +import { updateRedundancy } from '../../../../shared/utils/server/redundancy'
  import { ActorFollow } from '../../../../shared/models/actors'
  import { readdir } from 'fs-extra'
  import { join } from 'path'