yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved logic for tests to pass

Browse Source
This commit is contained in:
ivanThePleasant 2022-03-30 11:54:06 +03:00
parent 675c19219b
commit 15e2b96fc6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/server/controllers/__tests__/admin.test.js
View File

@ -40,6 +40,10 @@ describe('Admin Controller', () => {
const result = await adminController.init(); const result = await adminController.init();
expect(global.strapi.config.get).toHaveBeenCalledWith('uuid', false); expect(global.strapi.config.get).toHaveBeenCalledWith('uuid', false);
expect(global.strapi.config.get).toHaveBeenCalledWith(
'packageJsonStrapi.telemetryDisabled',
null
);
expect(global.strapi.admin.services.user.exists).toHaveBeenCalled(); expect(global.strapi.admin.services.user.exists).toHaveBeenCalled();
expect(result.data).toBeDefined(); expect(result.data).toBeDefined();
expect(result.data).toStrictEqual({ expect(result.data).toStrictEqual({

9
packages/core/admin/server/controllers/admin.js
View File

@ -39,8 +39,13 @@ module.exports = {
async init() { async init() {
let uuid = strapi.config.get('uuid', false); let uuid = strapi.config.get('uuid', false);
const hasAdmin = await getService('user').exists(); const hasAdmin = await getService('user').exists();
const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', false); // set to null if telemetryDisabled flag not avaialble in package.json
if (telemetryDisabled) uuid = null; const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', null);
if (telemetryDisabled !== null && telemetryDisabled === true) {
uuid = false;
}
return { data: { uuid, hasAdmin } }; return { data: { uuid, hasAdmin } };
}, },