Makefile not needed for testing anymore

nicola · nicola · commit fbfa428ad0da · 2015-07-08T04:33:03.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,6 @@ node_js:
 
 before_script:
   - npm install --quiet -g grunt-cli karma bower
-  - make &
-  - sleep 5
 
 after_script: killall node
 
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -1,7 +1,5 @@
 var fs = require('fs');
-var ldnode = require('../index');
-var express = require('express');
-var session = require('express-session');
+var ldnode = require('../server');
 var options = require('../options.js');
 var logging = require('../logging.js');
 
@@ -53,35 +51,10 @@ if (process.platform !== 'win32') {
     });
 }
 
-var app = express();
-app.use(session({
-  secret: 'node-ldp',
-  saveUninitialized: false,
-  resave: false
-}));
-
-ldnode(app, options)
-
-if (options.webid) {
-  try {
-    var key = fs.readFileSync(options.privateKey);
-    var cert = fs.readFileSync(options.cert);
-  } catch (err) {
-    logging.log("Server -- Error reading private key or certificate: " + err);
+ldnode(options, function(err) {
+  if (err) {
     process.exit(1);
   }
-
-  var credentials = {
-    key: key,
-    cert: cert,
-    requestCert: true
-  };
-  logging.log("Server -- Private Key: " + credentials.key);
-  logging.log("Server -- Certificate: " + credentials.cert);
-  https.createServer(credentials, app).listen(options.port);
-} else {
-  app.listen(options.port);
-}
-
-logging.log("Server -- Listening on port " + options.port);
+  logging.log('LDP started!');
+})
 
diff --git a/index.js b/index.js
@@ -30,16 +30,45 @@ var putHandler = require('./handlers/put.js');
 var deleteHandler = require('./handlers/delete.js');
 var patchHandler = require('./handlers/patch.js');
 
-function ldnode (app, options) {
+function ldnode (opts, callback) {
+  var app = express();
+
+  // Session [TODO]
+  app.use(session({
+    secret: 'node-ldp',
+    saveUninitialized: false,
+    resave: false
+  }));
+
+  // Creating root container
   container.createRootContainer();
 
+  // Adding proxy
   if (options.xssProxy) {
     proxy(app, options.proxyFilter);
   }
 
+  // Setup Express app
+  options.init(opts);
   app.use(options.pathStart, routes());
   ws(app);
   logging.log("Server -- Router attached to " + options.pathStart);
+  logging.log("Server -- Listening on port " + options.port);
+
+  if (!options.webid) {
+    return app;
+  }
+
+  var credentials = {
+    key: fs.readFileSync(key),
+    cert: fs.readFileSync(cert),
+    requestCert: true
+  };
+
+  logging.log("Server -- Private Key: " + credentials.key);
+  logging.log("Server -- Certificate: " + credentials.cert);
+
+  return https.createServer(credentials, app);
 }
 
 function proxy (app, path) {
diff --git a/test/secure-test.js b/test/secure-test.js
@@ -50,7 +50,7 @@ function createOptions(path, user) {
     return options;
 }
 
-describe.only('Basic HTTPS Test', function() {
+describe('Basic HTTPS Test', function() {
     it('Should return "Hello, World!"', function(done) {
         var options = createOptions('hello.html', 'user1');
         console.log(options)
diff --git a/test/test.js b/test/test.js
@@ -6,6 +6,15 @@ var S = require('string');
 var supertest = require('supertest');
 
 var address = 'http://localhost:3456/test/';
+var ldnode = require('../index');
+var express = require('express');
+
+var ldp = ldnode({
+  uriBase: address,
+  fileBase: __dirname
+});
+ldp.listen(3456);
+
 var server = supertest(address);
 
 process.chdir('./test', undefined);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ function createOptions(path, user) {`
`50`	`50`	`return options;`
`51`	`51`	`}`
`52`	`52`
`53`		`-describe.only('Basic HTTPS Test', function() {`
	`53`	`+describe('Basic HTTPS Test', function() {`
`54`	`54`	`it('Should return "Hello, World!"', function(done) {`
`55`	`55`	`var options = createOptions('hello.html', 'user1');`
`56`	`56`	`console.log(options)`