# HG changeset patch # User Pierre-Yves David # Date 1276510426 -7200 # Node ID 4a0600664f85fb1ac16abaabb3b145cca87dfeae # Parent 74c19dac29cfbfd615ddb5505a1951210b6ed61c Use the qunit automatic launcher for existing testcase. diff -r 74c19dac29cf -r 4a0600664f85 web/test/jstests/test_ajax.js --- a/web/test/jstests/test_ajax.js Tue Jun 01 18:18:26 2010 +0200 +++ b/web/test/jstests/test_ajax.js Mon Jun 14 12:13:46 2010 +0200 @@ -154,7 +154,8 @@ var scriptsIncluded = jsSources(); equals(jQuery.inArray('http://foo.js', scriptsIncluded), - 1); equals(jQuery('head link').length, 1); - equals(jQuery('head link').attr('href'), 'qunit.css'); + /* use endswith because in pytest context we have an absolute path */ + ok(jQuery('head link').attr('href').endswith('/qunit.css')); stop(); jQuery('#main').loadxhtml('/../ajax_url1.html', { callback: function() { @@ -169,7 +170,8 @@ equals(jQuery('#main h1').html(), 'Hello'); // qunit.css is not added twice equals(jQuery('head link').length, 1); - equals(jQuery('head link').attr('href'), 'qunit.css'); + /* use endswith because in pytest context we have an absolute path */ + ok(jQuery('head link').attr('href').endswith('/qunit.css')); start(); } }); diff -r 74c19dac29cf -r 4a0600664f85 web/test/test_jscript.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/test/test_jscript.py Mon Jun 14 12:13:46 2010 +0200 @@ -0,0 +1,33 @@ +from cubicweb.devtools.qunit import QUnitTestCase, unittest_main + +from os import path as osp + + +class JScript(QUnitTestCase): + + all_js_tests = ( + ("jstests/test_datetime.js",( + "../data/cubicweb.js", + "../data/cubicweb.compat.js",)), + ("jstests/test_htmlhelpers.js", ( + "../data/cubicweb.js", + "../data/cubicweb.compat.js", + "../data/cubicweb.python.js", + "../data/cubicweb.htmlhelpers.js")), + ("jstests/test_ajax.js",( + "../data/cubicweb.python.js", + "../data/cubicweb.js", + "../data/cubicweb.compat.js", + "../data/cubicweb.htmlhelpers.js", + "../data/cubicweb.ajax.js", + ),( + "jstests/ajax_url0.html", + "jstests/ajax_url1.html", + "jstests/ajax_url2.html", + "jstests/ajaxresult.json", + )) + ) + + +if __name__ == '__main__': + unittest_main()