From b295d15eae5685015853fc61c2490b51faf3d467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 14 Oct 2020 20:02:32 -0400 Subject: [PATCH] fix: tests --- src/webserver.js | 3 +-- src/widgets/admin.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/webserver.js b/src/webserver.js index 5578bfe65f..26db9d1a35 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -8,6 +8,7 @@ var os = require('os'); var nconf = require('nconf'); var express = require('express'); var app = express(); +app.renderAsync = util.promisify((tpl, data, callback) => app.render(tpl, data, callback)); var server; var winston = require('winston'); var async = require('async'); @@ -116,8 +117,6 @@ function setupExpressApp(app) { const relativePath = nconf.get('relative_path'); const viewsDir = nconf.get('views_dir'); - app.renderAsync = util.promisify((tpl, data, callback) => app.render(tpl, data, callback)); - app.engine('tpl', function (filepath, data, next) { filepath = filepath.replace(/\.tpl$/, '.js'); diff --git a/src/widgets/admin.js b/src/widgets/admin.js index e63d02d8f2..c8c778a84a 100644 --- a/src/widgets/admin.js +++ b/src/widgets/admin.js @@ -1,6 +1,6 @@ 'use strict'; -const app = require('../webserver').app; +const webserver = require('../webserver'); const plugins = require('../plugins'); const groups = require('../groups'); const index = require('./index'); @@ -54,7 +54,7 @@ async function getAvailableWidgets() { async function renderAdminTemplate() { const groupsData = await groups.getNonPrivilegeGroups('groups:createtime', 0, -1); groupsData.sort((a, b) => b.system - a.system); - return await app.renderAsync('admin/partials/widget-settings', { groups: groupsData }); + return await webserver.app.renderAsync('admin/partials/widget-settings', { groups: groupsData }); } function buildTemplatesFromAreas(areas) {