Speedup CI

[github/Chocobozzz/PeerTube.git] / server / tests / cli / peertube.ts

diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index 27fbde02de7848f38fd8e0cc6c12c461662ab1ce..fcf7e2e2e50c253b14d187a7f82f0bc490612fb5 100644 (file)
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -2,8 +2,10 @@
 
 import 'mocha'
 import { expect } from 'chai'
+import { Video, VideoDetails } from '../../../shared'
 import {
   addVideoChannel,
+  areHttpImportTestsDisabled,
   buildAbsoluteFixturePath,
   cleanupTests,
   createUser,
@@ -17,11 +19,11 @@ import {
   removeVideo,
   ServerInfo,
   setAccessTokensToServers,
+  testHelloWorldRegisteredSettings,
   uploadVideoAndGetId,
   userLogin,
   waitJobs
 } from '../../../shared/extra-utils'
-import { Video, VideoDetails } from '../../../shared'
 import { getYoutubeVideoUrl } from '../../../shared/extra-utils/videos/video-imports'
 
 describe('Test CLI wrapper', function () {
@@ -64,6 +66,18 @@ describe('Test CLI wrapper', function () {
       await execCLI(`${env} ${cmd} auth add -u ${server.url} -U user_1 -p super_password`)
     })
 
+    it('Should not fail to add a user if there is a slash at the end of the instance URL', async function () {
+      this.timeout(60000)
+
+      const env = getEnvCli(server)
+      let fullServerURL
+      fullServerURL = server.url + '/'
+      await execCLI(`${env} ${cmd} auth add -u ${fullServerURL} -U user_1 -p super_password`)
+
+      fullServerURL = server.url + '/asdfasdf'
+      await execCLI(`${env} ${cmd} auth add -u ${fullServerURL} -U user_1 -p super_password`)
+    })
+
     it('Should default to this user', async function () {
       this.timeout(60000)
 
@@ -112,6 +126,8 @@ describe('Test CLI wrapper', function () {
     })
 
     it('Should import a video', async function () {
+      if (areHttpImportTestsDisabled()) return
+
       this.timeout(60000)
 
       const env = getEnvCli(server)
@@ -122,6 +138,8 @@ describe('Test CLI wrapper', function () {
     })
 
     it('Should have imported the video', async function () {
+      if (areHttpImportTestsDisabled()) return
+
       this.timeout(60000)
 
       await waitJobs([ server ])
@@ -144,6 +162,8 @@ describe('Test CLI wrapper', function () {
     })
 
     it('Should import and override some imported attributes', async function () {
+      if (areHttpImportTestsDisabled()) return
+
       this.timeout(60000)
 
       const env = getEnvCli(server)
@@ -198,6 +218,10 @@ describe('Test CLI wrapper', function () {
       await execCLI(`${env} ${cmd} plugins install --npm-name peertube-plugin-hello-world`)
     })
 
+    it('Should have registered settings', async function () {
+      await testHelloWorldRegisteredSettings(server)
+    })
+
     it('Should list installed plugins', async function () {
       const env = getEnvCli(server)
       const res = await execCLI(`${env} ${cmd} plugins list`)