fix: tests

v1.18.x
Barış Soner Uşaklı 4 years ago
parent d89477cad0
commit b295d15eae

@ -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');

@ -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) {

Loading…
Cancel
Save