Fixes #4051 - fixes security token unit test and language unit tests

diff --git a/js/tests/ElggLanguagesTest.js b/js/tests/ElggLanguagesTest.js
index 1f66fc35bace441e0feedfda8a9f4ea093fbde04..9186ff5bbad1c00d5ae0e2f2afb0fff2d193f766 100644 (file)
--- a/js/tests/ElggLanguagesTest.js
+++ b/js/tests/ElggLanguagesTest.js
@@ -6,7 +6,7 @@ ElggLanguagesTest.prototype.setUp = function() {
        //Immediately execute some dummy "returned" javascript instead of sending
        //an actual ajax request
        $.ajax = function(settings) {
-               var lang = settings.data.js.split('/')[1];
+               var lang = settings.data.language;
                elgg.config.translations[lang] = {'language':lang};
        };
 };

diff --git a/js/tests/ElggSecurityTest.js b/js/tests/ElggSecurityTest.js
index f1111168f3b5f2a8b357e9442ed9701da95a9ae2..c7309d55ffce6ce66b7eea8ae63606add55b0e5c 100644 (file)
--- a/js/tests/ElggSecurityTest.js
+++ b/js/tests/ElggSecurityTest.js
@@ -31,10 +31,10 @@ ElggSecurityTest.prototype.testAddTokenAcceptsString = function() {
                str = "__elgg_ts=" + this.ts + "&__elgg_token=" + this.token;
        
        input = "";
-       assertEquals(str, elgg.security.addToken(input));
+       assertEquals('?' + str, elgg.security.addToken(input));
        
-       input = "data=sofar";
-       assertEquals(input+'&'+str, elgg.security.addToken(input));
+       input = "?data=sofar";
+       assertEquals(input + '&' + str, elgg.security.addToken(input));
        
 };