From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Thu, 29 Aug 2013 01:34:59 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/jtanx/MCTX3420.git
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=451d87b0434c725a6d8eb393b3ee2299048d5f8e;hp=94729dbccb4a87e999c6cc344ca915d8de53d45f;p=matches%2FMCTX3420.git

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
--- 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!
   });
 });