From 6c5065a011b099618681a37bd77eaa7bd3db752e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 13 Jul 2021 09:43:59 +0200
Subject: Introduce server commands

---
 shared/extra-utils/requests/check-api-params.ts | 11 +++++------
 shared/extra-utils/requests/requests.ts         |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'shared/extra-utils/requests')

diff --git a/shared/extra-utils/requests/check-api-params.ts b/shared/extra-utils/requests/check-api-params.ts
index 7f5ff775c..7df63b004 100644
--- a/shared/extra-utils/requests/check-api-params.ts
+++ b/shared/extra-utils/requests/check-api-params.ts
@@ -1,13 +1,12 @@
+import { HttpStatusCode } from '@shared/core-utils'
 import { makeGetRequest } from './requests'
-import { immutableAssign } from '../miscs/miscs'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {
   return makeGetRequest({
     url,
     path,
     token,
-    query: immutableAssign(query, { start: 'hello' }),
+    query: { ...query, start: 'hello' },
     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
   })
 }
@@ -17,7 +16,7 @@ async function checkBadCountPagination (url: string, path: string, token?: strin
     url,
     path,
     token,
-    query: immutableAssign(query, { count: 'hello' }),
+    query: { ...query, count: 'hello' },
     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
   })
 
@@ -25,7 +24,7 @@ async function checkBadCountPagination (url: string, path: string, token?: strin
     url,
     path,
     token,
-    query: immutableAssign(query, { count: 2000 }),
+    query: { ...query, count: 2000 },
     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
   })
 }
@@ -35,7 +34,7 @@ function checkBadSortPagination (url: string, path: string, token?: string, quer
     url,
     path,
     token,
-    query: immutableAssign(query, { sort: 'hello' }),
+    query: { ...query, sort: 'hello' },
     statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
   })
 }
diff --git a/shared/extra-utils/requests/requests.ts b/shared/extra-utils/requests/requests.ts
index 3fbaa31d6..f9d112aca 100644
--- a/shared/extra-utils/requests/requests.ts
+++ b/shared/extra-utils/requests/requests.ts
@@ -4,8 +4,8 @@ import { isAbsolute, join } from 'path'
 import { decode } from 'querystring'
 import * as request from 'supertest'
 import { URL } from 'url'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-import { buildAbsoluteFixturePath, root } from '../miscs/miscs'
+import { HttpStatusCode } from '@shared/core-utils'
+import { buildAbsoluteFixturePath, root } from '../miscs/tests'
 
 function get4KFileUrl () {
   return 'https://download.cpy.re/peertube/4k_file.txt'
-- 
cgit v1.2.3