From 9d42fd929373025a8a2da7f8fc226ecdcc38cedd Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Wed, 7 Feb 2024 13:11:57 +0000 Subject: [PATCH] test(queries/get-config): incorporate feature flags cover disableNotificationsPage and disableFavicon feature flags --- .../src/graphql/queries/get-config.ee.js | 10 +++--- .../src/graphql/queries/get-config.ee.test.js | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/graphql/queries/get-config.ee.js b/packages/backend/src/graphql/queries/get-config.ee.js index e3c76053..b20216bc 100644 --- a/packages/backend/src/graphql/queries/get-config.ee.js +++ b/packages/backend/src/graphql/queries/get-config.ee.js @@ -2,14 +2,14 @@ import appConfig from '../../config/app.js'; import { hasValidLicense } from '../../helpers/license.ee.js'; import Config from '../../models/config.js'; -const defaultConfig = { - disableNotificationsPage: appConfig.disableNotificationsPage, - disableFavicon: appConfig.disableFavicon, -}; - const getConfig = async (_parent, params) => { if (!(await hasValidLicense())) return {}; + const defaultConfig = { + disableNotificationsPage: appConfig.disableNotificationsPage, + disableFavicon: appConfig.disableFavicon, + }; + const configQuery = Config.query(); if (Array.isArray(params.keys)) { diff --git a/packages/backend/src/graphql/queries/get-config.ee.test.js b/packages/backend/src/graphql/queries/get-config.ee.test.js index dd82e532..74a438e6 100644 --- a/packages/backend/src/graphql/queries/get-config.ee.test.js +++ b/packages/backend/src/graphql/queries/get-config.ee.test.js @@ -2,6 +2,7 @@ import { vi, describe, it, expect, beforeEach } from 'vitest'; import request from 'supertest'; import app from '../../app'; import { createConfig } from '../../../test/factories/config'; +import appConfig from '../../config/app'; import * as license from '../../helpers/license.ee'; describe('graphQL getConfig query', () => { @@ -56,6 +57,8 @@ describe('graphQL getConfig query', () => { [configOne.key]: configOne.value.data, [configTwo.key]: configTwo.value.data, [configThree.key]: configThree.value.data, + disableNotificationsPage: false, + disableFavicon: false, }, }, }; @@ -82,6 +85,38 @@ describe('graphQL getConfig query', () => { getConfig: { [configOne.key]: configOne.value.data, [configTwo.key]: configTwo.value.data, + disableNotificationsPage: false, + disableFavicon: false, + }, + }, + }; + + expect(response.body).toEqual(expectedResponsePayload); + }); + }); + + describe('and with different defaults', () => { + beforeEach(async () => { + vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue( + true + ); + vi.spyOn(appConfig, 'disableFavicon', 'get').mockReturnValue(true); + }); + + it('should return custom config', async () => { + const response = await request(app) + .post('/graphql') + .send({ query }) + .expect(200); + + const expectedResponsePayload = { + data: { + getConfig: { + [configOne.key]: configOne.value.data, + [configTwo.key]: configTwo.value.data, + [configThree.key]: configThree.value.data, + disableNotificationsPage: true, + disableFavicon: true, }, }, };