diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /server/tests/api/index.js | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'server/tests/api/index.js')
| -rw-r--r-- | server/tests/api/index.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/tests/api/index.js b/server/tests/api/index.js index 61c9a7aca..11f49e1e2 100644 --- a/server/tests/api/index.js +++ b/server/tests/api/index.js | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | 'use strict' | 1 | 'use strict' |
| 2 | 2 | ||
| 3 | // Order of the tests we want to execute | 3 | // Order of the tests we want to execute |
| 4 | require('./checkParams') | 4 | require('./check-params') |
| 5 | require('./friendsBasic') | 5 | require('./friends-basic') |
| 6 | require('./users') | 6 | require('./users') |
| 7 | require('./singlePod') | 7 | require('./single-pod') |
| 8 | require('./multiplePods') | 8 | require('./multiple-pods') |
| 9 | require('./friendsAdvanced') | 9 | require('./friends-advanced') |