diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/tests/api/search | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/tests/api/search')
| -rw-r--r-- | server/tests/api/search/search-activitypub-video-channels.ts | 6 | ||||
| -rw-r--r-- | server/tests/api/search/search-activitypub-videos.ts | 4 | ||||
| -rw-r--r-- | server/tests/api/search/search-videos.ts | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts index a287c5bdf..a411e973b 100644 --- a/server/tests/api/search/search-activitypub-video-channels.ts +++ b/server/tests/api/search/search-activitypub-video-channels.ts | |||
| @@ -17,10 +17,10 @@ import { | |||
| 17 | uploadVideo, | 17 | uploadVideo, |
| 18 | userLogin, | 18 | userLogin, |
| 19 | wait | 19 | wait |
| 20 | } from '../../utils' | 20 | } from '../../../../shared/utils' |
| 21 | import { waitJobs } from '../../utils/server/jobs' | 21 | import { waitJobs } from '../../../../shared/utils/server/jobs' |
| 22 | import { VideoChannel } from '../../../../shared/models/videos' | 22 | import { VideoChannel } from '../../../../shared/models/videos' |
| 23 | import { searchVideoChannel } from '../../utils/search/video-channels' | 23 | import { searchVideoChannel } from '../../../../shared/utils/search/video-channels' |
| 24 | 24 | ||
| 25 | const expect = chai.expect | 25 | const expect = chai.expect |
| 26 | 26 | ||
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts index 28f4fac50..f881917e7 100644 --- a/server/tests/api/search/search-activitypub-videos.ts +++ b/server/tests/api/search/search-activitypub-videos.ts | |||
| @@ -16,8 +16,8 @@ import { | |||
| 16 | uploadVideo, | 16 | uploadVideo, |
| 17 | wait, | 17 | wait, |
| 18 | searchVideo | 18 | searchVideo |
| 19 | } from '../../utils' | 19 | } from '../../../../shared/utils' |
| 20 | import { waitJobs } from '../../utils/server/jobs' | 20 | import { waitJobs } from '../../../../shared/utils/server/jobs' |
| 21 | import { Video, VideoPrivacy } from '../../../../shared/models/videos' | 21 | import { Video, VideoPrivacy } from '../../../../shared/models/videos' |
| 22 | 22 | ||
| 23 | const expect = chai.expect | 23 | const expect = chai.expect |
diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts index f1392ffea..50da837da 100644 --- a/server/tests/api/search/search-videos.ts +++ b/server/tests/api/search/search-videos.ts | |||
| @@ -13,7 +13,7 @@ import { | |||
| 13 | uploadVideo, | 13 | uploadVideo, |
| 14 | wait, | 14 | wait, |
| 15 | immutableAssign | 15 | immutableAssign |
| 16 | } from '../../utils' | 16 | } from '../../../../shared/utils' |
| 17 | 17 | ||
| 18 | const expect = chai.expect | 18 | const expect = chai.expect |
| 19 | 19 | ||