From b4f7288193682d9db040b93db1b9a23fdcb8dc0a Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 2 Aug 2015 13:58:47 +0200 Subject: [PATCH] [REM] test: phantom_jsfile method deprecate phantom_jsfile method, keeping only phantom_js, phantom_js takes a code argument to run client side only. Removing phantom_jsfile will allow to switch from phantom to any other engine such as running google chrome or firefox directly. The only use of phantom_jsfile was an example. --- addons/web_tests/tests/test_ui.py | 4 ---- addons/web_tests/tests/test_ui_hello.js | 5 ----- addons/web_tests/tests/test_ui_load.js | 5 ----- openerp/tests/common.py | 17 ----------------- 4 files changed, 31 deletions(-) delete mode 100644 addons/web_tests/tests/test_ui_hello.js delete mode 100644 addons/web_tests/tests/test_ui_load.js diff --git a/addons/web_tests/tests/test_ui.py b/addons/web_tests/tests/test_ui.py index f1577d1d156..6376e0749cf 100644 --- a/addons/web_tests/tests/test_ui.py +++ b/addons/web_tests/tests/test_ui.py @@ -4,10 +4,6 @@ import os import openerp.tests class TestUi(openerp.tests.HttpCase): - def test_01_jsfile_ui_hello(self): - self.phantom_jsfile(os.path.join(os.path.dirname(__file__), 'test_ui_hello.js')) - def test_02_jsfile_ui_load(self): - self.phantom_jsfile(os.path.join(os.path.dirname(__file__), 'test_ui_load.js')) def test_03_js_public(self): self.phantom_js('/',"console.log('ok')","console") def test_04_js_admin(self): diff --git a/addons/web_tests/tests/test_ui_hello.js b/addons/web_tests/tests/test_ui_hello.js deleted file mode 100644 index 6a453e947aa..00000000000 --- a/addons/web_tests/tests/test_ui_hello.js +++ /dev/null @@ -1,5 +0,0 @@ -console.log("hello from test_phantom_hello.js"); -console.log("ok"); -// For a failure use: -//console.log("error"); -phantom.exit(); diff --git a/addons/web_tests/tests/test_ui_load.js b/addons/web_tests/tests/test_ui_load.js deleted file mode 100644 index 8daf8e876e0..00000000000 --- a/addons/web_tests/tests/test_ui_load.js +++ /dev/null @@ -1,5 +0,0 @@ -// Load helper -var system = require('system'); -phantom.injectJs(system.args[1]); -pt = new PhantomTest(); -pt.run("/", "console.log('ok')", "console"); diff --git a/openerp/tests/common.py b/openerp/tests/common.py index 65de700352a..25f1d409ae9 100644 --- a/openerp/tests/common.py +++ b/openerp/tests/common.py @@ -349,23 +349,6 @@ class HttpCase(TransactionCase): openerp.tools.misc.dumpstacks() t0 = t1 - def phantom_jsfile(self, jsfile, timeout=60, **kw): - options = { - 'timeout' : timeout, - 'port': PORT, - 'db': get_db_name(), - 'session_id': self.session_id, - } - options.update(kw) - phantomtest = os.path.join(os.path.dirname(__file__), 'phantomtest.js') - # phantom.args[0] == phantomtest path - # phantom.args[1] == options - cmd = [ - 'phantomjs', - jsfile, phantomtest, json.dumps(options) - ] - self.phantom_run(cmd, timeout) - def phantom_js(self, url_path, code, ready="window", login=None, timeout=60, **kw): """ Test js code running in the browser - optionnally log as 'login'