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/feeds | |
| 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/feeds')
| -rw-r--r-- | server/tests/feeds/feeds.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts index 28fe3493b..a771474bc 100644 --- a/server/tests/feeds/feeds.ts +++ b/server/tests/feeds/feeds.ts | |||
| @@ -13,10 +13,10 @@ import { | |||
| 13 | ServerInfo, | 13 | ServerInfo, |
| 14 | setAccessTokensToServers, | 14 | setAccessTokensToServers, |
| 15 | uploadVideo, userLogin | 15 | uploadVideo, userLogin |
| 16 | } from '../utils' | 16 | } from '../../../shared/utils' |
| 17 | import * as libxmljs from 'libxmljs' | 17 | import * as libxmljs from 'libxmljs' |
| 18 | import { addVideoCommentThread } from '../utils/videos/video-comments' | 18 | import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments' |
| 19 | import { waitJobs } from '../utils/server/jobs' | 19 | import { waitJobs } from '../../../shared/utils/server/jobs' |
| 20 | import { User } from '../../../shared/models/users' | 20 | import { User } from '../../../shared/models/users' |
| 21 | 21 | ||
| 22 | chai.use(require('chai-xml')) | 22 | chai.use(require('chai-xml')) |