[FIX] test ui should use /login route for auto login
bzr revid: fme@openerp.com-20140115161318-v8ksw0u0u1mpgn0x
This commit is contained in:
parent
3755e320a0
commit
96c79572f8
|
@ -146,6 +146,6 @@ def full_path(filename):
|
|||
|
||||
def load_tests(loader, base, _):
|
||||
base.addTest(WebsiteUiSuite(full_path('dummy_test.js'), {}, 5.0))
|
||||
base.addTest(WebsiteUiSuite(full_path('simple_dom_test.js'), { 'action': 'website.action_website_homepage' }, 60.0))
|
||||
base.addTest(WebsiteUiSuite(full_path('homepage_test.js'), { 'action': 'website.action_website_homepage' }, 60.0))
|
||||
base.addTest(WebsiteUiSuite(full_path('simple_dom_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
|
||||
base.addTest(WebsiteUiSuite(full_path('homepage_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
|
||||
return base
|
||||
|
|
|
@ -27,15 +27,16 @@ function run (test) {
|
|||
var scheme = options.scheme ? options.scheme+'://' : 'http://';
|
||||
var host = options.host ? options.host : 'localhost';
|
||||
var port = options.port ? ':'+options.port : '';
|
||||
var path = options.path ? options.path : '/web';
|
||||
var path = options.path ? options.path : '/login';
|
||||
|
||||
var queryParams = [];
|
||||
if (options.db) queryParams.push('db='+options.db);
|
||||
if (options.user) queryParams.push('login='+options.user);
|
||||
if (options.password) queryParams.push('key='+options.password);
|
||||
if (options.redirect) queryParams.push('redirect='+options.redirect);
|
||||
var query = queryParams.length > 0 ? '?'+queryParams.join('&') : '';
|
||||
|
||||
var hashParams = [];
|
||||
if (options.user) hashParams.push('login='+options.user);
|
||||
if (options.password) hashParams.push('password='+options.password);
|
||||
if (options.action) hashParams.push('action='+options.action);
|
||||
var hash = hashParams.length > 0 ? '#'+hashParams.join('&') : '';
|
||||
|
||||
|
|
|
@ -6,5 +6,5 @@ def full_path(filename):
|
|||
return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename)
|
||||
|
||||
def load_tests(loader, base, _):
|
||||
base.addTest(test_ui.WebsiteUiSuite(full_path('post_test.js'), { 'action': 'website.action_website_homepage' }, 60.0))
|
||||
return base
|
||||
base.addTest(test_ui.WebsiteUiSuite(full_path('post_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
|
||||
return base
|
||||
|
|
|
@ -6,5 +6,5 @@ def full_path(filename):
|
|||
return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename)
|
||||
|
||||
def load_tests(loader, base, _):
|
||||
base.addTest(test_ui.WebsiteUiSuite(full_path('event_test.js'), { 'action': 'website.action_website_homepage' }, 60.0))
|
||||
return base
|
||||
base.addTest(test_ui.WebsiteUiSuite(full_path('event_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
|
||||
return base
|
||||
|
|
Loading…
Reference in New Issue