Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reenable credentials test as root #1493

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reenable credentials test as root #1493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8750297
Reenable credentials-test-as-root
strugee Sep 28, 2017
67ef52e
Fix Express 4 deprecations in credentials-test-as-root
strugee Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions test/credentials-test-as-root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ var assert = require("assert"),
fs = require("fs"),
path = require("path"),
express = require("express"),
http = require("http"),
multipart = require("connect-multiparty"),
DialbackClient = require("dialback-client"),
databank = require("databank"),
Databank = databank.Databank,
Expand All @@ -42,13 +44,14 @@ var tc = JSON.parse(fs.readFileSync(path.join(__dirname, "config.json")));

var tinyApp = function(port, hostname, callback) {

var app = express.createServer();
var app = express(),
appServer = http.createServer(app);

app.set("port", port);
app.use(express.json());
app.use(express.urlencoded());
app.use(express.multipart());
app.use(app.router);
app.use(express.urlencoded({extended: true}));
// TODO: use the multiparty API directly instead of this Connect middleware wrapper
app.use(multipart());

app.get("/.well-known/host-meta.json", function(req, res) {
res.json({
Expand Down Expand Up @@ -87,7 +90,7 @@ var tinyApp = function(port, hostname, callback) {
});

app.listen(port, hostname, function() {
callback(null, app);
callback(null, appServer);
});
};

Expand Down Expand Up @@ -269,6 +272,4 @@ suite.addBatch({
}
});

module.exports = {}; // TODO reenable this test when it's passing

// suite["export"](module);
suite["export"](module);