aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-07 10:07:53 +0200
committerChocobozzz <me@florianbigard.com>2018-08-08 09:30:31 +0200
commita84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4 (patch)
treecf2feafcfadb5b6e9784c86d67e692db8d599b7d /server/tests
parent990b6a0b0c4fbebc165e5cf7cec8fbc1cbaa6c66 (diff)
downloadPeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.gz
PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.zst
PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.zip
Add import.video.torrent configuration
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/check-params/config.ts3
-rw-r--r--server/tests/api/server/config.ts5
-rw-r--r--server/tests/utils/server/config.ts3
3 files changed, 11 insertions, 0 deletions
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 2742e26de..b26dfa252 100644
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -65,6 +65,9 @@ describe('Test config API validators', function () {
65 videos: { 65 videos: {
66 http: { 66 http: {
67 enabled: false 67 enabled: false
68 },
69 torrent: {
70 enabled: false
68 } 71 }
69 } 72 }
70 } 73 }
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index b65061a5d..f9805b6ea 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -45,6 +45,7 @@ function checkInitialConfig (data: CustomConfig) {
45 expect(data.transcoding.resolutions['720p']).to.be.true 45 expect(data.transcoding.resolutions['720p']).to.be.true
46 expect(data.transcoding.resolutions['1080p']).to.be.true 46 expect(data.transcoding.resolutions['1080p']).to.be.true
47 expect(data.import.videos.http.enabled).to.be.true 47 expect(data.import.videos.http.enabled).to.be.true
48 expect(data.import.videos.torrent.enabled).to.be.true
48} 49}
49 50
50function checkUpdatedConfig (data: CustomConfig) { 51function checkUpdatedConfig (data: CustomConfig) {
@@ -72,6 +73,7 @@ function checkUpdatedConfig (data: CustomConfig) {
72 expect(data.transcoding.resolutions['720p']).to.be.false 73 expect(data.transcoding.resolutions['720p']).to.be.false
73 expect(data.transcoding.resolutions['1080p']).to.be.false 74 expect(data.transcoding.resolutions['1080p']).to.be.false
74 expect(data.import.videos.http.enabled).to.be.false 75 expect(data.import.videos.http.enabled).to.be.false
76 expect(data.import.videos.torrent.enabled).to.be.false
75} 77}
76 78
77describe('Test config', function () { 79describe('Test config', function () {
@@ -167,6 +169,9 @@ describe('Test config', function () {
167 videos: { 169 videos: {
168 http: { 170 http: {
169 enabled: false 171 enabled: false
172 },
173 torrent: {
174 enabled: false
170 } 175 }
171 } 176 }
172 } 177 }
diff --git a/server/tests/utils/server/config.ts b/server/tests/utils/server/config.ts
index e21614282..d6ac3ef8a 100644
--- a/server/tests/utils/server/config.ts
+++ b/server/tests/utils/server/config.ts
@@ -97,6 +97,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
97 videos: { 97 videos: {
98 http: { 98 http: {
99 enabled: false 99 enabled: false
100 },
101 torrent: {
102 enabled: false
100 } 103 }
101 } 104 }
102 } 105 }