From 138c82e2caf290b94d9ae16d61bc50330d99af9d Mon Sep 17 00:00:00 2001
From: Francisco Baio Dias <xicombd@gmail.com>
Date: Tue, 22 Mar 2016 19:38:28 +0000
Subject: [PATCH] Clean up browser + nodejs tests

---
 karma.conf.js                              |  5 +++--
 package.json                               |  2 +-
 tests/{ => browser-nodejs}/browser.js      |  2 +-
 tests/{karma.js => browser-nodejs/test.js} | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename tests/{ => browser-nodejs}/browser.js (93%)
 rename tests/{karma.js => browser-nodejs/test.js} (61%)

diff --git a/karma.conf.js b/karma.conf.js
index 3515a92..54c9fa9 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -4,11 +4,12 @@ module.exports = function (config) {
     frameworks: ['mocha'],
 
     files: [
-      'tests/browser.js'
+      'tests/browser-nodejs/browser.js'
     ],
 
     preprocessors: {
-      'tests/*': ['webpack']
+      'tests/*': ['webpack'],
+      'tests/browser-nodejs/*': ['webpack']
     },
 
     webpack: {
diff --git a/package.json b/package.json
index c09da06..fc68428 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "test:compliance:transport": "node tests/transport.js",
     "test:specific": "mocha tests/*-test.js",
     "test:node": "npm run test:specific",
-    "test:browser": "node tests/karma",
+    "test:browser": "node tests/browser-nodejs/test.js",
     "test": "npm run test:node && npm run test:browser",
     "test-2": "npm run test:specific && npm run test:compliance:transport && npm run test:compliance:connection",
     "lint": "standard"
diff --git a/tests/browser.js b/tests/browser-nodejs/browser.js
similarity index 93%
rename from tests/browser.js
rename to tests/browser-nodejs/browser.js
index 6a09372..5688ee6 100644
--- a/tests/browser.js
+++ b/tests/browser-nodejs/browser.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 const expect = require('chai').expect
-const WSlibp2p = require('../src')
+const WSlibp2p = require('../../src')
 const multiaddr = require('multiaddr')
 
 describe('libp2p-websockets', function () {
diff --git a/tests/karma.js b/tests/browser-nodejs/test.js
similarity index 61%
rename from tests/karma.js
rename to tests/browser-nodejs/test.js
index f54f161..854f0c4 100644
--- a/tests/karma.js
+++ b/tests/browser-nodejs/test.js
@@ -1,12 +1,12 @@
 const Server = require('karma').Server
 const path = require('path')
 
-const WSlibp2p = require('../src')
+const WSlibp2p = require('../../src')
 const multiaddr = require('multiaddr')
 
 var ws
 
-function createServer (done) {
+function createListener (done) {
   ws = new WSlibp2p()
   const mh = multiaddr('/ip4/127.0.0.1/tcp/9090/websockets')
   ws.createListener(mh, (socket) => {
@@ -18,11 +18,11 @@ function stopServer (done) {
   ws.close(done)
 }
 
-function runTests (done) {
+function run (done) {
   new Server({
-    configFile: path.join(__dirname, '/../karma.conf.js'),
+    configFile: path.join(__dirname, '/../../karma.conf.js'),
     singleRun: true
   }, done).start()
 }
 
-createServer(() => runTests(() => stopServer(() => null)))
+createListener(() => run((exitCode) => stopServer(() => process.exit(exitCode))))