diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-12-07 16:09:57 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-12-07 16:25:29 +0100 |
| commit | 2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f (patch) | |
| tree | 998a0af6923475c85eb8e97ca1d30afb42655263 /server/tests/api/activitypub/client.ts | |
| parent | 4b49385892b25aea5aa9e605fbcb66074bcb49b0 (diff) | |
| parent | 35adc403b7eed6d1309bbce901268a76dd01b6ef (diff) | |
| download | PeerTube-2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f.tar.gz PeerTube-2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f.tar.zst PeerTube-2a8c5d0af13f3ccb9a505e1fbc9d324b9d33ba1f.zip | |
Merge branch 'move-utils-to-shared' of https://github.com/buoyantair/PeerTube into buoyantair-move-utils-to-shared
Diffstat (limited to 'server/tests/api/activitypub/client.ts')
| -rw-r--r-- | server/tests/api/activitypub/client.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts index ea0682634..6d90d8643 100644 --- a/server/tests/api/activitypub/client.ts +++ b/server/tests/api/activitypub/client.ts | |||
| @@ -8,10 +8,10 @@ import { | |||
| 8 | flushTests, | 8 | flushTests, |
| 9 | killallServers, | 9 | killallServers, |
| 10 | makeActivityPubGetRequest, | 10 | makeActivityPubGetRequest, |
| 11 | runServer, | ||
| 12 | ServerInfo, | 11 | ServerInfo, |
| 13 | setAccessTokensToServers, uploadVideo | 12 | setAccessTokensToServers, |
| 14 | } from '../../utils' | 13 | uploadVideo |
| 14 | } from '../../../../shared/utils' | ||
| 15 | 15 | ||
| 16 | const expect = chai.expect | 16 | const expect = chai.expect |
| 17 | 17 | ||