odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] update test runner pages, fix intermittent failure due to async test which didn't stop the test runner 

bzr revid: xmo@openerp.com-20120905151914-hkrstjh5698dnddg
This commit is contained in:
Xavier Morel 2012-09-05 17:19:14 +02:00
parent 910097617b
commit 4e23bcf80a
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/test/Widget.js
View File

@ -220,7 +220,7 @@ $(document).ready(function () {
});
module('Widget.renderElement', mod);
test('repeated', function () {
asyncTest('repeated', 4, function () {
var w = new (instance.web.Widget.extend({
template: 'test.widget.template-value'
}));

12
addons/web/static/test/fulltest.html
View File

@ -2,7 +2,7 @@
<html style="height: 100%">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenERP</title>
<title>OpenERP Web Full Stack</title>
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
@ -12,7 +12,7 @@
<script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
<!-- jquery -->
<script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
<script src="/web/static/lib/jquery/jquery-1.7.2.js"></script>
<script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
<script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
@ -37,13 +37,7 @@
<script src="/web/static/src/js/test_support.js"></script>
</head>
<body id="oe" class="openerp">
<h1 id="qunit-header">
OpenERP Web Test Suite: javascript to XML-RPC (excluded)
</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script type="text/javascript" src="/web/static/test/fulltest/dataset.js"></script>
</body>

8
addons/web/static/test/test.html
View File

@ -2,7 +2,7 @@
<html style="height: 100%">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenERP</title>
<title>OpenERP Web Test Suite</title>
<link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
@ -46,11 +46,7 @@
</script>
</head>
<body id="oe" class="openerp">
<h1 id="qunit-header">OpenERP web Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
</body>
<script type="text/javascript" src="/web/static/test/class.js"></script>