diff --git a/server.js b/server.js
index dc7b1e6..30e3c39 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,7 @@ var express = require('express'),
if (process.argv[2]) {
port = process.argv[2];
} else {
- port = 8080;
+ port = 8585;
}
if (process.argv[3] === '--dev') {
@@ -41,6 +41,11 @@ app.configure(function() {
return next();
});
}
+
+ if (dev) {
+ app.use(express['static'](__dirname + '/test'));
+ }
+
app.use(express['static'](__dirname + '/src'));
});
diff --git a/src/test/integration/index.html b/src/test/integration/index.html
deleted file mode 100644
index 25cefdc..0000000
--- a/src/test/integration/index.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
- JavaScript Integration Tests
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/unit/index.html b/src/test/unit/index.html
deleted file mode 100644
index 74545e0..0000000
--- a/src/test/unit/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
- JavaScript Unit Tests
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/integration/cloudstorage-dao-test.js b/test/integration/cloudstorage-dao-test.js
similarity index 100%
rename from src/test/integration/cloudstorage-dao-test.js
rename to test/integration/cloudstorage-dao-test.js
diff --git a/test/integration/index.html b/test/integration/index.html
new file mode 100644
index 0000000..2b1be85
--- /dev/null
+++ b/test/integration/index.html
@@ -0,0 +1,74 @@
+
+
+
+
+ JavaScript Integration Tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/pgp-test.js b/test/pgp-test.js
similarity index 100%
rename from src/test/pgp-test.js
rename to test/pgp-test.js
diff --git a/src/test/qunit-1.11.0.css b/test/qunit-1.11.0.css
similarity index 100%
rename from src/test/qunit-1.11.0.css
rename to test/qunit-1.11.0.css
diff --git a/src/test/qunit-1.11.0.js b/test/qunit-1.11.0.js
similarity index 100%
rename from src/test/qunit-1.11.0.js
rename to test/qunit-1.11.0.js
diff --git a/src/test/test-data.js b/test/test-data.js
similarity index 100%
rename from src/test/test-data.js
rename to test/test-data.js
diff --git a/src/test/unit/aes-test.js b/test/unit/aes-test.js
similarity index 100%
rename from src/test/unit/aes-test.js
rename to test/unit/aes-test.js
diff --git a/src/test/unit/crypto-test.js b/test/unit/crypto-test.js
similarity index 100%
rename from src/test/unit/crypto-test.js
rename to test/unit/crypto-test.js
diff --git a/src/test/unit/devicestorage-test.js b/test/unit/devicestorage-test.js
similarity index 100%
rename from src/test/unit/devicestorage-test.js
rename to test/unit/devicestorage-test.js
diff --git a/src/test/unit/ecc-test.js b/test/unit/ecc-test.js
similarity index 100%
rename from src/test/unit/ecc-test.js
rename to test/unit/ecc-test.js
diff --git a/src/test/unit/email-dao-test.js b/test/unit/email-dao-test.js
similarity index 100%
rename from src/test/unit/email-dao-test.js
rename to test/unit/email-dao-test.js
diff --git a/test/unit/index.html b/test/unit/index.html
new file mode 100644
index 0000000..52e283a
--- /dev/null
+++ b/test/unit/index.html
@@ -0,0 +1,89 @@
+
+
+
+
+ JavaScript Unit Tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/unit/lawnchair-dao-test.js b/test/unit/lawnchair-dao-test.js
similarity index 100%
rename from src/test/unit/lawnchair-dao-test.js
rename to test/unit/lawnchair-dao-test.js
diff --git a/src/test/unit/localstorage-dao-test.js b/test/unit/localstorage-dao-test.js
similarity index 100%
rename from src/test/unit/localstorage-dao-test.js
rename to test/unit/localstorage-dao-test.js
diff --git a/src/test/unit/nacl-crypto-test.js b/test/unit/nacl-crypto-test.js
similarity index 100%
rename from src/test/unit/nacl-crypto-test.js
rename to test/unit/nacl-crypto-test.js
diff --git a/src/test/unit/util-test.js b/test/unit/util-test.js
similarity index 100%
rename from src/test/unit/util-test.js
rename to test/unit/util-test.js