supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1818 from thelounge/astorije/improve-tests

Browse Source 
Remove dead code in tests, and fix a link test
This commit is contained in:
Pavel Djundik 2017-12-10 11:55:59 +02:00 committed by GitHub
commit 40af84b653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/fixtures/env.js vendored
View File

@ -1,11 +1,6 @@
"use strict"; "use strict";
global.log = { global.log = require("../../src/log.js");
error: () => console.error.apply(console, arguments), // eslint-disable-line no-console
warn: () => {},
info: () => {},
debug: () => {},
};
var home = require("path").join(__dirname, ".lounge"); var home = require("path").join(__dirname, ".lounge");
require("../../src/helper").setHome(home); require("../../src/helper").setHome(home);

18
test/plugins/auth/ldap.js
View File

@ -111,15 +111,23 @@ function testLdapAuth() {
describe("LDAP authentication plugin", function() { describe("LDAP authentication plugin", function() {
this.slow(200); this.slow(200);
before((done) => { let server;
this.server = startLdapServer(done); let originalLogInfo;
before(function(done) {
originalLogInfo = log.info;
log.info = () => {};
server = startLdapServer(done);
}); });
after(() => { after(function() {
this.server.close(); server.close();
log.info = originalLogInfo;
}); });
beforeEach(() => { beforeEach(function() {
Helper.config.public = false; Helper.config.public = false;
Helper.config.ldap.enable = true; Helper.config.ldap.enable = true;
Helper.config.ldap.url = "ldap://localhost:" + String(serverPort); Helper.config.ldap.url = "ldap://localhost:" + String(serverPort);

42
test/plugins/link.js
View File

@ -9,25 +9,25 @@ const link = require("../../src/plugins/irc-events/link.js");
describe("Link plugin", function() { describe("Link plugin", function() {
this.slow(200); this.slow(200);
before(function(done) { let app;
this.app = util.createWebserver();
this.app.get("/real-test-image.png", function(req, res) { beforeEach(function(done) {
app = util.createWebserver();
app.get("/real-test-image.png", function(req, res) {
res.sendFile(path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png")); res.sendFile(path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png"));
}); });
this.connection = this.app.listen(9002, done); this.connection = app.listen(9002, done);
});
after(function(done) {
this.connection.close(done);
});
beforeEach(function() {
this.irc = util.createClient(); this.irc = util.createClient();
this.network = util.createNetwork(); this.network = util.createNetwork();
Helper.config.prefetchStorage = false; Helper.config.prefetchStorage = false;
}); });
afterEach(function(done) {
this.connection.close(done);
});
it("should be able to fetch basic information about URLs", function(done) { it("should be able to fetch basic information about URLs", function(done) {
const url = "http://localhost:9002/basic"; const url = "http://localhost:9002/basic";
const message = this.irc.createMessage({ const message = this.irc.createMessage({
@ -45,7 +45,7 @@ describe("Link plugin", function() {
shown: true, shown: true,
}]); }]);
this.app.get("/basic", function(req, res) { app.get("/basic", function(req, res) {
res.send("<title>test title</title><meta name='description' content='simple description'>"); res.send("<title>test title</title><meta name='description' content='simple description'>");
}); });
@ -67,7 +67,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/basic-og", function(req, res) { app.get("/basic-og", function(req, res) {
res.send("<title>test</title><meta property='og:title' content='opengraph test'>"); res.send("<title>test</title><meta property='og:title' content='opengraph test'>");
}); });
@ -84,7 +84,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/description-og", function(req, res) { app.get("/description-og", function(req, res) {
res.send("<meta name='description' content='simple description'><meta property='og:description' content='opengraph description'>"); res.send("<meta name='description' content='simple description'><meta property='og:description' content='opengraph description'>");
}); });
@ -101,7 +101,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/thumb", function(req, res) { app.get("/thumb", function(req, res) {
res.send("<title>Google</title><meta property='og:image' content='http://localhost:9002/real-test-image.png'>"); res.send("<title>Google</title><meta property='og:image' content='http://localhost:9002/real-test-image.png'>");
}); });
@ -119,7 +119,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/thumb-image-src", function(req, res) { app.get("/thumb-image-src", function(req, res) {
res.send("<link rel='image_src' href='http://localhost:9002/real-test-image.png'>"); res.send("<link rel='image_src' href='http://localhost:9002/real-test-image.png'>");
}); });
@ -136,7 +136,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/thumb-image-src", function(req, res) { app.get("/thumb-image-src", function(req, res) {
res.send("<link rel='image_src' href='//localhost:9002/real-test-image.png'>"); res.send("<link rel='image_src' href='//localhost:9002/real-test-image.png'>");
}); });
@ -153,7 +153,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/relative-thumb", function(req, res) { app.get("/relative-thumb", function(req, res) {
res.send("<title>test relative image</title><meta property='og:image' content='/real-test-image.png'>"); res.send("<title>test relative image</title><meta property='og:image' content='/real-test-image.png'>");
}); });
@ -172,7 +172,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/thumb-no-title", function(req, res) { app.get("/thumb-no-title", function(req, res) {
res.send("<meta property='og:image' content='http://localhost:9002/real-test-image.png'>"); res.send("<meta property='og:image' content='http://localhost:9002/real-test-image.png'>");
}); });
@ -191,7 +191,7 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
this.app.get("/thumb-404", function(req, res) { app.get("/thumb-404", function(req, res) {
res.send("<title>404 image</title><meta property='og:image' content='http://localhost:9002/this-image-does-not-exist.png'>"); res.send("<title>404 image</title><meta property='og:image' content='http://localhost:9002/this-image-does-not-exist.png'>");
}); });
@ -241,11 +241,11 @@ describe("Link plugin", function() {
shown: true, shown: true,
}]); }]);
this.app.get("/one", function(req, res) { app.get("/one", function(req, res) {
res.send("<title>first title</title>"); res.send("<title>first title</title>");
}); });
this.app.get("/two", function(req, res) { app.get("/two", function(req, res) {
res.send("<title>second title</title>"); res.send("<title>second title</title>");
}); });

10
test/server.js
View File

@ -8,13 +8,19 @@ const io = require("socket.io-client");
describe("Server", function() { describe("Server", function() {
this.timeout(5000); this.timeout(5000);
let server; let server;
let originalLogInfo;
before(function() {
originalLogInfo = log.info;
log.info = () => {};
before(() => {
server = require("../src/server")(); server = require("../src/server")();
}); });
after((done) => { after(function(done) {
server.close(done); server.close(done);
log.info = originalLogInfo;
}); });
const webURL = `http://${Helper.config.host}:${Helper.config.port}/`; const webURL = `http://${Helper.config.host}:${Helper.config.port}/`;

6
test/util.js
View File

@ -7,12 +7,8 @@ var express = require("express");
var Network = require("../src/models/network"); var Network = require("../src/models/network");
var Chan = require("../src/models/chan"); var Chan = require("../src/models/chan");
function MockClient(opts) { function MockClient() {
this.user = {nick: "test-user"}; this.user = {nick: "test-user"};
for (var k in opts) {
this[k] = opts[k];
}
} }
util.inherits(MockClient, EventEmitter); util.inherits(MockClient, EventEmitter);