diff --git a/apps/sumo/views.py b/apps/sumo/views.py index d8de881cb..4b84950fc 100644 --- a/apps/sumo/views.py +++ b/apps/sumo/views.py @@ -2,6 +2,7 @@ import logging import os import socket import StringIO +from time import time from django.conf import settings from django.contrib.sites.models import Site @@ -179,4 +180,5 @@ def monitor(request): def kitsune_qunit(request, path): """View that hosts QUnit tests.""" ctx = django_qunit.views.get_suite_context(request, path) + ctx.update(timestamp=time()) return jingo.render(request, 'tests/qunit.html', ctx) diff --git a/media/js/libs/jstestnet.js b/media/js/libs/jstestnet.js index d2bba7748..12203d777 100644 --- a/media/js/libs/jstestnet.js +++ b/media/js/libs/jstestnet.js @@ -82,6 +82,11 @@ if (typeof(details.source) !== 'undefined') { msg.stacktrace = details.source; } + if(typeof(details.actual) !== 'undefined' && + typeof(details.expected) !== 'undefined') { + msg.actual = details.actual; + msg.expected = details.expected; + } } postMsg(msg); }; diff --git a/media/js/tests/ajaxvotetests.js b/media/js/tests/ajaxvotetests.js index a58884331..7bfab30ca 100644 --- a/media/js/tests/ajaxvotetests.js +++ b/media/js/tests/ajaxvotetests.js @@ -7,6 +7,7 @@ var kboxFixture = { url: '/vote', status: 200, contentType: 'text/json', + responseTime: 0, response: function(settings) { // set the response message to the key/values POSTed var message = '' @@ -24,7 +25,7 @@ var kboxFixture = { }; module('ajaxvote', kboxFixture); -/* + asyncTest('helpful vote', function() { var $sandbox = this.sandbox, $messageBox; @@ -64,5 +65,5 @@ asyncTest('not helpful vote', function() { start(); }); }); -*/ + }); diff --git a/templates/tests/qunit.html b/templates/tests/qunit.html index a4b9bffb2..86f9633be 100644 --- a/templates/tests/qunit.html +++ b/templates/tests/qunit.html @@ -2,8 +2,8 @@ QUnit Test Suite - - + + - - {{ js('common') }} - - + + {% for jsfile in settings.MINIFY_BUNDLES['js']['common'] %} + + {% endfor %} + + {% for url in suite.extra_urls %} - + {% endfor %} {% for url in suite.extra_media_urls %} - + {% endfor %} {% for file in files %} - + {% endfor %}