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

[REV] reverting xmo@openerp.com-20140310115334-vjh7gx5oizdm6s67 

This api change breaks jsfile tests (example test_ui_load.js). The api is broken
but the proper fix would be to avoid accessing phantom.args from PhantomTest

bzr revid: al@openerp.com-20140310184636-8r9x81xi1zqhcsek
This commit is contained in:
Antony Lesuisse 2014-03-10 19:46:36 +01:00
parent 5e036bbf7c
commit 096432ff73
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openerp/tests/phantomtest.js
View File

@ -96,10 +96,7 @@ function PhantomTest() {
// ----------------------------------------------------
// run test
// ----------------------------------------------------
this.run = function() {
var url_path = this.options.url_path,
code = this.options.code,
ready = this.options.ready;
this.run = function(url_path, code, ready) {
if(self.options.login) {
var qp = [];
qp.push('db=' + self.options.db);
@ -116,12 +113,15 @@ function PhantomTest() {
console.log('loaded', url, status);
// process ready
waitFor(function() {
console.log("waiting for: calling page evaluate");
return self.page.evaluate(function (ready) {
console.log("waiting for", ready);
var r = false;
try {
console.log("waiting for: page evaluating ", ready);
r = !!eval(ready);
} catch(ex) { }
console.log("waiting for: returning from page evaluate");
return r;
}, ready);
// run test
@ -135,7 +135,8 @@ function PhantomTest() {
// js mode or jsfile mode
if(phantom.args.length === 1) {
new PhantomTest().run();
pt = new PhantomTest();
pt.run(pt.options.url_path, pt.options.code, pt.options.ready);
}
// vim:et: