From ef4d1e470a9d996e5a28d23ae8fbf3a6a47cdecb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Mar 2011 10:28:28 +0100 Subject: [PATCH] [FIX] qunit's assertion format is actually (actual, expected) not (expected, actual). Fix to get correct failure messages bzr revid: xmo@openerp.com-20110310092828-j3be503khvjcwqkl --- addons/base/static/qweb/qweb-test.js.html | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/base/static/qweb/qweb-test.js.html b/addons/base/static/qweb/qweb-test.js.html index dfe7d225285..f5fa240f57c 100644 --- a/addons/base/static/qweb/qweb-test.js.html +++ b/addons/base/static/qweb/qweb-test.js.html @@ -27,31 +27,31 @@ }); test("Basic escaped output", function () { - equals("ok", render('esc-literal', {}), "Render a literal string"); - equals("ok", render('esc-variable', {ok: 'ok'}), "Render a string variable"); - equals("<ok>", render('esc-toescape', {ok: ''}), "Render a string with data to escape"); + equals(render('esc-literal', {}), "ok", "Render a literal string"); + equals(render('esc-variable', {ok: 'ok'}), "ok", "Render a string variable"); + equals(render('esc-toescape', {ok: ''}), "<ok>", "Render a string with data to escape"); }); test("Formatted escaped output", function () { - equals("ok", render('escf-noformat-literal', {}), "Render a literal string"); - equals("ok", render('escf-simpleformat-variable', {value: 'ok'}), + equals(render('escf-noformat-literal', {}), "ok", "Render a literal string"); + equals(render('escf-simpleformat-variable', {value: 'ok'}), "ok", "Only render an interpolated variable"); - equals("[ok]", render('escf-format-variable', {value: 'ok'}), + equals(render('escf-format-variable', {value: 'ok'}), "[ok]", "Actually formatted variable"); - equals('[<ok>]', render('escf-format-variable-with-escapes', {value: ''}), + equals(render('escf-format-variable-with-escapes', {value: ''}), '[<ok>]', "Render a formatted string with data to escape"); }); test("Basic unescaped output", function () { - equals("ok", render('raw-literal', {}), "Render a literal string"); - equals("ok", render('raw-variable', {ok: 'ok'}), "Render a string variable"); - equals("", render('raw-notescaped', {ok: ''}), "Render a string with data not escaped"); + equals(render('raw-literal', {}), "ok", "Render a literal string"); + equals(render('raw-variable', {ok: 'ok'}), "ok", "Render a string variable"); + equals(render('raw-notescaped', {ok: ''}), "", "Render a string with data not escaped"); }); test("Formatted unescaped output", function () { - equals("ok", render('rawf-noformat-literal', {}), "Render a literal string"); - equals("ok", render('rawf-simpleformat-variable', {value: 'ok'}), + equals(render('rawf-noformat-literal', {}), "ok", "Render a literal string"); + equals(render('rawf-simpleformat-variable', {value: 'ok'}), "ok", "Only render an interpolated variable"); - equals("[ok]", render('rawf-format-variable', {value: 'ok'}), + equals(render('rawf-format-variable', {value: 'ok'}), "[ok]", "Actually formatted variable"); - equals('[]', render('rawf-format-variable-notescaped', {value: ''}), + equals(render('rawf-format-variable-notescaped', {value: ''}), '[]', "Render a formatted string with data not escaped"); }); });