From e419f8142a3484730b7d81c5fe619e7b79b45695 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 30 Jan 2019 03:04:47 -0500 Subject: [PATCH] fix(test): fixed --- app.js | 2 +- src/controllers/tickets.js | 8 +++++++- test/0_database.js | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 80c767587..189f70d31 100644 --- a/app.js +++ b/app.js @@ -173,7 +173,7 @@ function dbCallback (err, db) { return next() }, function (next) { - //Start Check Mail + // Start Check Mail var settingSchema = require('./src/models/setting') settingSchema.getSetting('mailer:check:enable', function (err, mailCheckEnabled) { if (err) { diff --git a/src/controllers/tickets.js b/src/controllers/tickets.js index c4ad961d4..efd262113 100644 --- a/src/controllers/tickets.js +++ b/src/controllers/tickets.js @@ -91,7 +91,13 @@ ticketsController.getByStatus = function (req, res, next) { status: [] } - var pathname = url.URL(req.url).pathname + var fullUrl = url.format({ + protocol: req.protocol, + host: req.get('host'), + pathname: req.originalUrl + }) + + var pathname = new url.URL(fullUrl).pathname var arr = pathname.split('/') var tType = 'new' var s = 0 diff --git a/test/0_database.js b/test/0_database.js index cbcf90f5f..709cfa588 100644 --- a/test/0_database.js +++ b/test/0_database.js @@ -1,5 +1,5 @@ /* eslint-disable no-unused-expressions */ -/* globals server */ +/* globals server socketServer */ var expect = require('chai').expect var winston = require('winston') var async = require('async') @@ -136,6 +136,8 @@ before(function (done) { expect(err).to.not.exist global.server = ws.server + require('../src/socketserver')(ws) + cb() }, 3111 @@ -154,6 +156,7 @@ after(function (done) { this.timeout(5000) mongoose.connection.dropDatabase(function () { mongoose.connection.close(function () { + socketServer.eventLoop.stop() server.close() done()