projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9100976)
[IMP] update test runner pages, fix intermittent failure due to async test which...
authorXavier Morel <xmo@openerp.com>
Wed, 5 Sep 2012 15:19:14 +0000 (17:19 +0200)
committerXavier Morel <xmo@openerp.com>
Wed, 5 Sep 2012 15:19:14 +0000 (17:19 +0200)
bzr revid: xmo@openerp.com-20120905151914-hkrstjh5698dnddg

addons/web/static/test/Widget.js patch | blob | history
addons/web/static/test/fulltest.html patch | blob | history
addons/web/static/test/test.html patch | blob | history

diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 102a7d9..3e6cc26 100644 (file)
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -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'
         }));
diff --git a/addons/web/static/test/fulltest.html b/addons/web/static/test/fulltest.html
index a031325..2917b24 100644 (file)
--- a/addons/web/static/test/fulltest.html
+++ b/addons/web/static/test/fulltest.html
@@ -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>
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index 35d57d3..209723a 100644 (file)
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -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>
Unnamed repository; edit this file 'description' to name the repository.