diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
| commit | e771ff815dba3b4a95633f4e1e10dacd222dfe61 (patch) | |
| tree | 9e1909e1fff3c602ac894b43dbf72316aca62b70 /server/tests | |
| parent | 8a2166c9bfa452ce707740d99c64d668cd7cedce (diff) | |
| parent | 62f53731cf807562ba885b180e71bb75b3902443 (diff) | |
| download | PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.gz PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.zst PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server/tests')
| -rw-r--r-- | server/tests/api/check-params/config.ts | 2 | ||||
| -rw-r--r-- | server/tests/api/server/config.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts index c8dbbf797..99fb24a5b 100644 --- a/server/tests/api/check-params/config.ts +++ b/server/tests/api/check-params/config.ts | |||
| @@ -165,7 +165,7 @@ describe('Test config API validators', function () { | |||
| 165 | trending: { | 165 | trending: { |
| 166 | videos: { | 166 | videos: { |
| 167 | algorithms: { | 167 | algorithms: { |
| 168 | enabled: [ 'best', 'hot', 'most-viewed', 'most-liked' ], | 168 | enabled: [ 'hot', 'most-viewed', 'most-liked' ], |
| 169 | default: 'most-viewed' | 169 | default: 'most-viewed' |
| 170 | } | 170 | } |
| 171 | } | 171 | } |
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index f31012a5c..0f2fb5493 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts | |||
| @@ -367,7 +367,7 @@ const newCustomConfig: CustomConfig = { | |||
| 367 | trending: { | 367 | trending: { |
| 368 | videos: { | 368 | videos: { |
| 369 | algorithms: { | 369 | algorithms: { |
| 370 | enabled: [ 'best', 'hot', 'most-viewed', 'most-liked' ], | 370 | enabled: [ 'hot', 'most-viewed', 'most-liked' ], |
| 371 | default: 'hot' | 371 | default: 'hot' |
| 372 | } | 372 | } |
| 373 | } | 373 | } |