Merge branch 'master' of https://github.com/jtanx/MCTX3420.git

Conflicts:
	testing/qunit/unit-tests.js

diff --git a/testing/qunit/unit-tests.js b/testing/qunit/unit-tests.js
index b7ba7e1..8aec28f 100644 (file)
--- a/testing/qunit/unit-tests.js
+++ b/testing/qunit/unit-tests.js
@@ -88,14 +88,14 @@ QUnit.asyncTest("API Existence", function () {
   query("test", function(data) {
    start();
    //TODO:Change fastcgi error codes
-   equal(parseInt(data.status, 10), -1, "Nonexistent module"); //Magic numbers!
+   equal(parseInt(data.status, 10), 400, "Nonexistent module"); //Magic numbers!
   });
 });
 
 QUnit.asyncTest("Login test", function() {
   query("login", {"force" : true}, "mctxadmin", "admin", function(data) {
    start();
-   equal(parseInt(data.status, 10), 0, "Login ok"); //Magic numbers!
+   equal(parseInt(data.status, 10), 200, "Login ok"); //Magic numbers!
   });
 });