From 5cc7237f63cecba24cbc52146dcfb57145ec3892 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 16 Mar 2014 15:12:28 +0100 Subject: [PATCH] [REM] useless jsonrpc tests and controllers bzr revid: al@openerp.com-20140316141228-0c35ymruttd5mx2j --- addons/web/__openerp__.py | 1 - addons/web/controllers/testing.py | 7 -- addons/web/static/test/jsonrpc.js | 152 ------------------------------ 3 files changed, 160 deletions(-) delete mode 100644 addons/web/static/test/jsonrpc.js diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 72f1610177c..f1d7d7511c7 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -87,7 +87,6 @@ This module provides the core of the OpenERP Web Client. "static/test/data.js", "static/test/list-utils.js", "static/test/formats.js", - "static/test/jsonrpc.js", "static/test/rpc-misordered.js", "static/test/evals.js", "static/test/search.js", diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py index c99efed4294..a51b619d49f 100644 --- a/addons/web/controllers/testing.py +++ b/addons/web/controllers/testing.py @@ -157,10 +157,3 @@ class TestRunnerController(http.Controller): # replace OS path separators (from join & normpath) by URI ones yield path[len(root):].replace(os.path.sep, '/') - @http.route('/web/tests/set_session_value', type='json', auth="none") - def set_session_value(self, value): - request.session.some_test_value = value - - @http.route('/web/tests/get_session_value', type='json', auth="none") - def get_session_value(self): - return request.session.some_test_value diff --git a/addons/web/static/test/jsonrpc.js b/addons/web/static/test/jsonrpc.js deleted file mode 100644 index 3b7140bacff..00000000000 --- a/addons/web/static/test/jsonrpc.js +++ /dev/null @@ -1,152 +0,0 @@ -(function() { - -var ropenerp = window.openerp; - -var openerp = ropenerp.declare($, _, QWeb2); - -ropenerp.testing.section('jsonrpc', {}, -function (test) { - test('basic-jsonrpc', {asserts: 1}, function () { - var session = new openerp.Session(); - return session.rpc("/gen_session_id", {}).then(function(result) { - ok(result.length > 0, "Result returned by /gen_session_id"); - }); - }); - test('basic-jsonprpc', {asserts: 1}, function () { - var session = new openerp.Session(); - session.origin_server = false; - return session.rpc("/gen_session_id", {}).then(function(result) { - ok(result.length > 0, "Result returned by /gen_session_id"); - }); - }); - // desactivated because the phantomjs runner crash - /*test('basic-jsonprpc2', {asserts: 1}, function () { - var session = new openerp.Session(); - session.origin_server = false; - return session.rpc("/gen_session_id", {}, {force2step: true}).then(function(result) { - ok(result.length > 0, "Result returned by /gen_session_id"); - }); - });*/ - test('session-jsonrpc', {asserts: 2}, function () { - var session = new openerp.Session(); - var tmp = _.uniqueId("something"); - return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() { - ok(true, "set_session returned"); - return session.rpc("/web/tests/get_session_value", {}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - }); - }); - test('session-jsonprpc', {asserts: 2}, function () { - var session = new openerp.Session(); - session.origin_server = false; - var tmp = _.uniqueId("something"); - return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() { - ok(true, "set_session returned"); - return session.rpc("/web/tests/get_session_value", {}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - }); - }); - // desactivated because the phantomjs runner crash - /*test('session-jsonprpc2', {asserts: 2}, function () { - var session = new openerp.Session(); - session.origin_server = false; - var tmp = _.uniqueId("something"); - return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() { - ok(true, "set_session returned"); - return session.rpc("/web/tests/get_session_value", {}, {force2step: true}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - }); - });*/ - test('overridesession-jsonrpc', {asserts: 4}, function () { - var origin_session = new openerp.Session(); - var origin_tmp = _.uniqueId("something"); - var session = new openerp.Session(null, null, {override_session: true}); - var tmp = _.uniqueId("something_else"); - return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() { - ok(true, "set_session returned"); - return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp}); - }).then(function(result) { - ok(true, "set_session on origin returned"); - return session.rpc("/web/tests/get_session_value", {}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - notEqual(result, origin_tmp, "Values in the different sessions should be different"); - }); - }); - test('overridesession-jsonprpc', {asserts: 4}, function () { - var origin_session = new openerp.Session(); - var origin_tmp = _.uniqueId("something"); - var session = new openerp.Session(null, null, {override_session: true}); - var tmp = _.uniqueId("something_else"); - session.origin_server = false; - return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() { - ok(true, "set_session returned"); - return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp}); - }).then(function(result) { - ok(true, "set_session on origin returned"); - return session.rpc("/web/tests/get_session_value", {}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - notEqual(result, origin_tmp, "Values in the different sessions should be different"); - }); - }); - // desactivated because the phantomjs runner crash - /*test('overridesession-jsonprpc2', {asserts: 4}, function () { - var origin_session = new openerp.Session(); - var origin_tmp = _.uniqueId("something"); - var session = new openerp.Session(null, null, {override_session: true}); - var tmp = _.uniqueId("something_else"); - session.origin_server = false; - return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() { - ok(true, "set_session returned"); - return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp}); - }).then(function(result) { - ok(true, "set_session on origin returned"); - return session.rpc("/web/tests/get_session_value", {}, {force2step: true}); - }).then(function(result) { - equal(result, tmp, "Got the same value from the session"); - notEqual(result, origin_tmp, "Values in the different sessions should be different"); - }); - });*/ - test('timeout-jsonrpc', {asserts: 1}, function () { - var session = new openerp.Session(); - return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() { - ok(false, "the request incorrectly succeeded"); - return $.when(); - }, function(a, e) { - e.preventDefault(); - ok(true, "the request correctly failed"); - return $.when(); - }); - }); - test('timeout-jsonprpc', {asserts: 1}, function () { - var session = new openerp.Session(); - session.origin_server = false; - return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() { - ok(false, "the request incorrectly succeeded"); - return $.when(); - }, function(a, e) { - e.preventDefault(); - ok(true, "the request correctly failed"); - return $.when(); - }); - }); - // desactivated because the phantomjs runner crash - /*test('timeout-jsonprpc2', {asserts: 1}, function () { - var session = new openerp.Session(); - session.origin_server = false; - return session.rpc("/gen_session_id", {}, {force2step: true, timeout: 1}).then(function() { - ok(false, "the request incorrectly succeeded"); - return $.when(); - }, function(a, e) { - e.preventDefault(); - ok(true, "the request correctly failed"); - return $.when(); - }); - });*/ -}); - -})();