aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-07-02 14:23:50 +0200
committerChocobozzz <me@florianbigard.com>2020-07-02 14:23:50 +0200
commit1e904cde34ba41a16256da1073336dd652368592 (patch)
tree0bd04e8f8d560f1b4b31112aab03c357d6b91d0d
parentd10538b47d134cebe9dfdbcef346e9bc94f993f0 (diff)
downloadPeerTube-1e904cde34ba41a16256da1073336dd652368592.tar.gz
PeerTube-1e904cde34ba41a16256da1073336dd652368592.tar.zst
PeerTube-1e904cde34ba41a16256da1073336dd652368592.zip
Fix users tests
-rw-r--r--config/test.yaml4
-rw-r--r--server/controllers/api/users/index.ts2
-rw-r--r--shared/extra-utils/users/users.ts2
-rw-r--r--support/doc/api/openapi.yaml10
4 files changed, 9 insertions, 9 deletions
diff --git a/config/test.yaml b/config/test.yaml
index 8e887407e..fb37ff8c7 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -87,8 +87,8 @@ import:
87 http: 87 http:
88 enabled: true 88 enabled: true
89 proxy: 89 proxy:
90 enabled: true 90 enabled: false
91 url: "http://188.165.225.149:7899" 91 url: ""
92 torrent: 92 torrent:
93 enabled: true 93 enabled: true
94 94
diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts
index 732a6faa3..c8e9eaeaa 100644
--- a/server/controllers/api/users/index.ts
+++ b/server/controllers/api/users/index.ts
@@ -205,7 +205,7 @@ async function createUser (req: express.Request, res: express.Response) {
205 205
206 Hooks.runAction('action:api.user.created', { body, user, account, videoChannel }) 206 Hooks.runAction('action:api.user.created', { body, user, account, videoChannel })
207 207
208 return res.status(201).json({ 208 return res.json({
209 user: { 209 user: {
210 id: user.id, 210 id: user.id,
211 account: { 211 account: {
diff --git a/shared/extra-utils/users/users.ts b/shared/extra-utils/users/users.ts
index 766189dfe..08b7743a6 100644
--- a/shared/extra-utils/users/users.ts
+++ b/shared/extra-utils/users/users.ts
@@ -29,7 +29,7 @@ function createUser (parameters: CreateUserArgs) {
29 videoQuota = 1000000, 29 videoQuota = 1000000,
30 videoQuotaDaily = -1, 30 videoQuotaDaily = -1,
31 role = UserRole.USER, 31 role = UserRole.USER,
32 specialStatus = 201 32 specialStatus = 200
33 } = parameters 33 } = parameters
34 34
35 const path = '/api/v1/users' 35 const path = '/api/v1/users'
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 186d7d37d..eec4e0248 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -53,7 +53,7 @@ externalDocs:
53tags: 53tags:
54 - name: Accounts 54 - name: Accounts
55 description: > 55 description: >
56 Accounts encompass remote accounts discovered across the federation, 56 Accounts encompass remote accounts discovered across the federation,
57 and correspond to the main Actor, along with video channels a user can create, which 57 and correspond to the main Actor, along with video channels a user can create, which
58 are also Actors. 58 are also Actors.
59 59
@@ -484,7 +484,7 @@ paths:
484 tags: 484 tags:
485 - Users 485 - Users
486 responses: 486 responses:
487 '201': 487 '200':
488 description: user created 488 description: user created
489 content: 489 content:
490 application/json: 490 application/json:
@@ -3879,11 +3879,11 @@ components:
3879 files: 3879 files:
3880 type: array 3880 type: array
3881 items: 3881 items:
3882 $ref: '#/components/schemas/FileRedundancyInformation' 3882 $ref: '#/components/schemas/FileRedundancyInformation'
3883 streamingPlaylists: 3883 streamingPlaylists:
3884 type: array 3884 type: array
3885 items: 3885 items:
3886 $ref: '#/components/schemas/FileRedundancyInformation' 3886 $ref: '#/components/schemas/FileRedundancyInformation'
3887 VideoImportStateConstant: 3887 VideoImportStateConstant:
3888 properties: 3888 properties:
3889 id: 3889 id:
@@ -5265,4 +5265,4 @@ components:
5265 content: 5265 content:
5266 application/json: 5266 application/json:
5267 schema: 5267 schema:
5268 $ref: '#/components/schemas/VideoListResponse' \ No newline at end of file 5268 $ref: '#/components/schemas/VideoListResponse'