From b79f35471ecd27f1372849a9fd63cac7f740d2fd Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 10:55:00 +0100
Subject: [FIX] testing: rpc tests works directly on the source database
 instead of copying it

bzr revid: chs@openerp.com-20140221095500-5cer5exzdei76y1d
---
 addons/web/static/src/js/testing.js | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index c4f5aeebd60..41dd2f03ad9 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -305,39 +305,16 @@ openerp.testing = {};
             case 'rpc':
                 async = true;
                 (function () {
-                // Bunch of random base36 characters
-                var dbname = 'test_' + Math.random().toString(36).slice(2);
-                // Add db setup/teardown at the start of the stack
+                // Add a session setup at the start of the stack to ensure user is logged in
                 case_stack = case_stack.unshift(function (instance) {
                     // FIXME hack: don't want the session to go through shitty loading process of everything
                     instance.session.session_init = testing.noop;
                     instance.session.load_modules = testing.noop;
                     instance.session.session_bind();
-                    return instance.session.rpc('/web/database/duplicate', {
-                        fields: [
-                            {name: 'super_admin_pwd', value: db.supadmin},
-                            {name: 'db_original_name', value: db.source},
-                            {name: 'db_name', value: dbname}
-                        ]
-                    }).then(function (result) {
-                        if (result.error) {
-                            return $.Deferred().reject(result.error).promise();
-                        }
-                        return instance.session.session_authenticate(
-                            dbname, 'admin', db.password, true);
-                    });
-                }, function (instance) {
-                    return instance.session.rpc('/web/database/drop', {
-                            fields: [
-                                {name: 'drop_pwd', value: db.supadmin},
-                                {name: 'drop_db', value: dbname}
-                            ]
-                        }).then(function (result) {
-                        if (result.error) {
-                            return $.Deferred().reject(result.error).promise();
-                        }
-                        return result;
-                    });
+                    if (instance.session.session_is_valid()) {
+                        return $.when();
+                    }
+                    return instance.session.session_authenticate(db.source, 'admin', db.password, true);
                 });
                 })();
             }
-- 
cgit v1.2.3


From bb7eb5269917cfde51abb50a4dca175ddd371fb9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 21 Feb 2014 15:35:18 +0100
Subject: [REM] RPC from js/qunit tests

They're a pain in the ass, they never worked right and they're basically
useless. Screw it.

bzr revid: xmo@openerp.com-20140221143518-hv3rjkw2b00ughvh
---
 addons/web/static/src/js/testing.js | 50 -------------------------------------
 1 file changed, 50 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 41dd2f03ad9..1f1c718ad5f 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -196,7 +196,6 @@ openerp.testing = {};
         });
     };
 
-    var db = window['oe_db_info'];
     testing.section = function (name, options, body) {
         if (_.isFunction(options)) {
             body = options;
@@ -235,40 +234,6 @@ openerp.testing = {};
             .push(env._oe.setup, env._oe.teardown)
             .push(options.setup, options.teardown);
         var opts = _.defaults({}, options, env._oe);
-        // FIXME: if this test is ignored, will still query
-        if (opts.rpc === 'rpc' && !db) {
-            QUnit.config.autostart = false;
-            db = {
-                source: null,
-                supadmin: null,
-                password: null
-            };
-            var $msg = $('<form style="margin: 0 1em 1em;">')
-                .append('<h3>A test needs to clone a database</h3>')
-                .append('<h4>Please provide the source clone information</h4>')
-                .append('     Source DB: ').append('<input name="source">').append('<br>')
-                .append('   DB Password: ').append('<input name="supadmin">').append('<br>')
-                .append('Admin Password: ').append('<input name="password">').append('<br>')
-                .append('<input type="submit" value="OK"/>')
-                .submit(function (e) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    db.source = $msg.find('input[name=source]').val();
-                    db.supadmin = $msg.find('input[name=supadmin]').val();
-                    db.password = $msg.find('input[name=password]').val();
-                    QUnit.start();
-                    $.unblockUI();
-                });
-            $.blockUI({
-                message: $msg,
-                css: {
-                    fontFamily: 'monospace',
-                    textAlign: 'left',
-                    whiteSpace: 'pre-wrap',
-                    cursor: 'default'
-                }
-            });
-        }
 
         QUnit.test(name, function () {
             var instance = openerp;
@@ -302,21 +267,6 @@ openerp.testing = {};
                     instance.session.responses[spec] = handler;
                 };
                 break;
-            case 'rpc':
-                async = true;
-                (function () {
-                // Add a session setup at the start of the stack to ensure user is logged in
-                case_stack = case_stack.unshift(function (instance) {
-                    // FIXME hack: don't want the session to go through shitty loading process of everything
-                    instance.session.session_init = testing.noop;
-                    instance.session.load_modules = testing.noop;
-                    instance.session.session_bind();
-                    if (instance.session.session_is_valid()) {
-                        return $.when();
-                    }
-                    return instance.session.session_authenticate(db.source, 'admin', db.password, true);
-                });
-                })();
             }
 
             // Always execute tests asynchronously
-- 
cgit v1.2.3