From f3aaa9a95cc2b61f1f255472d7014d08faa66561 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 5 Dec 2017 17:46:33 +0100 Subject: Fix client search --- server/tests/utils/videos.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'server/tests/utils/videos.ts') diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts index 73a9f1a0a..ff7da9bb2 100644 --- a/server/tests/utils/videos.ts +++ b/server/tests/utils/videos.ts @@ -145,26 +145,25 @@ function removeVideo (url: string, token: string, id: number, expectedStatus = 2 .expect(expectedStatus) } -function searchVideo (url: string, search: string, field?: string) { +function searchVideo (url: string, search: string) { const path = '/api/v1/videos' const req = request(url) - .get(path + '/search/' + search) - .set('Accept', 'application/json') - - if (field) req.query({ field }) + .get(path + '/search') + .query({ search }) + .set('Accept', 'application/json') return req.expect(200) - .expect('Content-Type', /json/) + .expect('Content-Type', /json/) } -function searchVideoWithPagination (url: string, search: string, field: string, start: number, count: number, sort?: string) { +function searchVideoWithPagination (url: string, search: string, start: number, count: number, sort?: string) { const path = '/api/v1/videos' const req = request(url) - .get(path + '/search/' + search) + .get(path + '/search') .query({ start }) + .query({ search }) .query({ count }) - .query({ field }) if (sort) req.query({ sort }) @@ -177,7 +176,8 @@ function searchVideoWithSort (url: string, search: string, sort: string) { const path = '/api/v1/videos' return request(url) - .get(path + '/search/' + search) + .get(path + '/search') + .query({ search }) .query({ sort }) .set('Accept', 'application/json') .expect(200) -- cgit v1.2.3 From cadb46d832724ea1a17b085b992142aa32e212be Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 8 Dec 2017 08:39:15 +0100 Subject: Design second video upload step --- server/tests/utils/videos.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/tests/utils/videos.ts') diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts index ff7da9bb2..bdf3368ac 100644 --- a/server/tests/utils/videos.ts +++ b/server/tests/utils/videos.ts @@ -201,7 +201,7 @@ async function testVideoImage (url: string, imageName: string, imagePath: string } } -async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 204) { +async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 201) { const path = '/api/v1/videos/upload' let defaultChannelId = '1' -- cgit v1.2.3 From e11f68a3562d2468480c396f47f1bdd2a306e17a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 8 Dec 2017 10:08:36 +0100 Subject: Optimise transaction for video upload --- server/tests/utils/videos.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/tests/utils/videos.ts') diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts index bdf3368ac..fb758cf29 100644 --- a/server/tests/utils/videos.ts +++ b/server/tests/utils/videos.ts @@ -201,7 +201,7 @@ async function testVideoImage (url: string, imageName: string, imagePath: string } } -async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 201) { +async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 200) { const path = '/api/v1/videos/upload' let defaultChannelId = '1' -- cgit v1.2.3