X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fconfig-defaults.ts;h=4ceda7de3c2ab8e4c7d03187d948d19faf9d5017;hb=bf54587a3e2ad9c2c186828f2a5682b91ee2cc00;hp=340d4b44bb7c79584a231a427c14cc2d6e369d86;hpb=a9bfa85d2cdf13670aaced740da5b493fbeddfce;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/config-defaults.ts b/server/tests/api/server/config-defaults.ts
index 340d4b44b..4ceda7de3 100644
--- a/server/tests/api/server/config-defaults.ts
+++ b/server/tests/api/server/config-defaults.ts
@@ -9,7 +9,7 @@ import {
   PeerTubeServer,
   setAccessTokensToServers,
   setDefaultVideoChannel
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
 import { VideoDetails, VideoPrivacy } from '@shared/models'
 
 const expect = chai.expect
@@ -125,40 +125,91 @@ describe('Test config defaults', function () {
 
   describe('Default P2P values', function () {
 
-    before(async function () {
-      const overrideConfig = {
-        defaults: {
-          p2p: {
-            enabled: false
+    describe('Webapp default value', function () {
+
+      before(async function () {
+        const overrideConfig = {
+          defaults: {
+            p2p: {
+              webapp: {
+                enabled: false
+              }
+            }
           }
         }
-      }
 
-      await server.kill()
-      await server.run(overrideConfig)
-    })
+        await server.kill()
+        await server.run(overrideConfig)
+      })
 
-    it('Should not have P2P enabled', async function () {
-      const config = await server.config.getConfig()
+      it('Should have appropriate P2P config', async function () {
+        const config = await server.config.getConfig()
 
-      expect(config.defaults.p2p.enabled).to.be.false
-    })
+        expect(config.defaults.p2p.webapp.enabled).to.be.false
+        expect(config.defaults.p2p.embed.enabled).to.be.true
+      })
+
+      it('Should create a user with this default setting', async function () {
+        await server.users.create({ username: 'user_p2p_1' })
+        const userToken = await server.login.getAccessToken('user_p2p_1')
+
+        const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
+        expect(p2pEnabled).to.be.false
+      })
 
-    it('Should create a user with this default setting', async function () {
-      await server.users.create({ username: 'user_p2p_1' })
-      const userToken = await server.login.getAccessToken('user_p2p_1')
+      it('Should register a user with this default setting', async function () {
+        await server.users.register({ username: 'user_p2p_2' })
 
-      const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
-      expect(p2pEnabled).to.be.false
+        const userToken = await server.login.getAccessToken('user_p2p_2')
+
+        const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
+        expect(p2pEnabled).to.be.false
+      })
     })
 
-    it('Should register a user with this default setting', async function () {
-      await server.users.register({ username: 'user_p2p_2' })
+    describe('Embed default value', function () {
+
+      before(async function () {
+        const overrideConfig = {
+          defaults: {
+            p2p: {
+              embed: {
+                enabled: false
+              }
+            }
+          },
+          signup: {
+            limit: 15
+          }
+        }
+
+        await server.kill()
+        await server.run(overrideConfig)
+      })
+
+      it('Should have appropriate P2P config', async function () {
+        const config = await server.config.getConfig()
 
-      const userToken = await server.login.getAccessToken('user_p2p_2')
+        expect(config.defaults.p2p.webapp.enabled).to.be.true
+        expect(config.defaults.p2p.embed.enabled).to.be.false
+      })
+
+      it('Should create a user with this default setting', async function () {
+        await server.users.create({ username: 'user_p2p_3' })
+        const userToken = await server.login.getAccessToken('user_p2p_3')
+
+        const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
+        expect(p2pEnabled).to.be.true
+      })
 
-      const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
-      expect(p2pEnabled).to.be.false
+      it('Should register a user with this default setting', async function () {
+        await server.users.register({ username: 'user_p2p_4' })
+
+        const userToken = await server.login.getAccessToken('user_p2p_4')
+
+        const { p2pEnabled } = await server.users.getMyInfo({ token: userToken })
+        expect(p2pEnabled).to.be.true
+      })
     })
   })