From 90ed82bb14801925b54582b4ac78132a2186685c Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 10 Feb 2014 14:19:10 +0100 Subject: [PATCH] [IMP] test phantomtest: inject files with testing if a variable is already setted bzr revid: chm@openerp.com-20140210131910-z8eggofegua88516 --- openerp/tests/phantomtest.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js index 9e8baae512a..6112df24107 100644 --- a/openerp/tests/phantomtest.js +++ b/openerp/tests/phantomtest.js @@ -64,9 +64,20 @@ function PhantomTest() { }; this.page.onLoadFinished = function(status) { if (status === "success") { + var src, test; for (var k in self.inject) { - if(!page.injectJs(self.inject[k])) { - self.error("Can't inject " + self.inject[k]); + if (typeof self.inject[k] !== "string") { + test = self.page.evaluate(function (variable) { + try { return eval("("+variable+")") != null; } + catch (e) { return false; } + }, self.inject[k][0]); + src = self.inject[k][1]; + } else { + src = self.inject[k]; + test = true; + } + if(test && !page.injectJs(src)) { + self.error("Can't inject " + src); } } }