From 9ee92651f64bf576c57eafe81fb3ab82def0d9e8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 28 Aug 2018 11:32:03 +0200 Subject: Fix tests --- server/controllers/api/config.ts | 1 + server/lib/oauth-model.ts | 1 - server/tests/api/server/config.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 3fd355e6d..8dfc3deb4 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -161,6 +161,7 @@ async function updateCustomConfig (req: express.Request, res: express.Response, // camelCase to snake_case key const toUpdateJSON = omit(toUpdate, 'user.videoQuota', 'instance.defaultClientRoute', 'instance.shortDescription', 'cache.videoCaptions') toUpdateJSON.user['video_quota'] = toUpdate.user.videoQuota + toUpdateJSON.user['video_quota_daily'] = toUpdate.user.videoQuotaDaily toUpdateJSON.instance['default_client_route'] = toUpdate.instance.defaultClientRoute toUpdateJSON.instance['short_description'] = toUpdate.instance.shortDescription toUpdateJSON.instance['default_nsfw_policy'] = toUpdate.instance.defaultNSFWPolicy diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts index 272e90f3a..09eaf75d1 100644 --- a/server/lib/oauth-model.ts +++ b/server/lib/oauth-model.ts @@ -23,7 +23,6 @@ function getClient (clientId: string, clientSecret: string) { function getRefreshToken (refreshToken: string) { logger.debug('Getting RefreshToken (refreshToken: ' + refreshToken + ').') - return OAuthTokenModel.getByRefreshTokenAndPopulateClient(refreshToken) } diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index 8a5f27c34..ece4118a6 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts @@ -37,7 +37,7 @@ function checkInitialConfig (data: CustomConfig) { expect(data.signup.limit).to.equal(4) expect(data.admin.email).to.equal('admin1@example.com') expect(data.user.videoQuota).to.equal(5242880) - expect(data.user.videoQuotaDaily).to.equal(318742) + expect(data.user.videoQuotaDaily).to.equal(-1) expect(data.transcoding.enabled).to.be.false expect(data.transcoding.threads).to.equal(2) expect(data.transcoding.resolutions['240p']).to.be.true -- cgit v1.2.3