diff options
Diffstat (limited to 'addons/web/static/tests')
| -rw-r--r-- | addons/web/static/tests/chrome/action_manager_tests.js | 18 | ||||
| -rw-r--r-- | addons/web/static/tests/fields/basic_fields_tests.js | 10 | ||||
| -rw-r--r-- | addons/web/static/tests/fields/relational_fields_tests.js | 508 | ||||
| -rw-r--r-- | addons/web/static/tests/fields/upgrade_fields_tests.js | 2 | ||||
| -rw-r--r-- | addons/web/static/tests/services/notification_service_tests.js | 6 | ||||
| -rw-r--r-- | addons/web/static/tests/views/calendar_tests.js | 104 | ||||
| -rw-r--r-- | addons/web/static/tests/views/form_tests.js | 184 | ||||
| -rw-r--r-- | addons/web/static/tests/views/kanban_tests.js | 62 | ||||
| -rw-r--r-- | addons/web/static/tests/views/list_tests.js | 16 | ||||
| -rw-r--r-- | addons/web/static/tests/views/view_dialogs_tests.js | 14 | ||||
| -rw-r--r-- | addons/web/static/tests/widgets/data_export_tests.js | 28 |
11 files changed, 476 insertions, 476 deletions
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js index b0a90173363..07febe83234 100644 --- a/addons/web/static/tests/chrome/action_manager_tests.js +++ b/addons/web/static/tests/chrome/action_manager_tests.js @@ -2624,12 +2624,12 @@ QUnit.module('ActionManager', { // go back to kanban view $('.o_control_panel .breadcrumb li:first a').click(); - assert.strictEqual($('.modal .modal-body').text(), + assert.strictEqual($('main.modal-body:first').text(), "The record has been modified, your changes will be discarded. Do you want to proceed?", "should display a modal dialog to confirm discard action"); // cancel - $('.modal .modal-footer button.btn-default').click(); + $('footer.modal-footer button.btn-default').click(); assert.strictEqual(actionManager.$('.o_form_view').length, 1, "should still be in form view"); @@ -2638,7 +2638,7 @@ QUnit.module('ActionManager', { $('.o_control_panel .breadcrumb li:first a').click(); // confirm discard - $('.modal .modal-footer button.btn-primary').click(); + $('footer.modal-footer button.btn-primary').click(); assert.strictEqual(actionManager.$('.o_form_view').length, 0, "should no longer be in form view"); @@ -3001,8 +3001,8 @@ QUnit.module('ActionManager', { assert.strictEqual($('.o_technical_modal .o_form_view').length, 1, "should have rendered a form view in a modal"); - assert.ok($('.o_technical_modal .modal-body').hasClass('o_act_window'), - "modal-body element should have classname 'o_act_window'"); + assert.ok($('.o_technical_modal main').hasClass('o_act_window'), + "dialog main element should have classname 'o_act_window'"); assert.ok($('.o_technical_modal .o_form_view').hasClass('o_form_editable'), "form view should be in edit mode"); @@ -3032,11 +3032,11 @@ QUnit.module('ActionManager', { }); actionManager.doAction(5); - assert.strictEqual($('.o_technical_modal .modal-body button.infooter').length, 0, + assert.strictEqual($('.o_technical_modal main button.infooter').length, 0, "the button should not be in the body"); - assert.strictEqual($('.o_technical_modal .modal-footer button.infooter').length, 1, + assert.strictEqual($('.o_technical_modal footer button.infooter').length, 1, "the button should be in the footer"); - assert.strictEqual($('.o_technical_modal .modal-footer button').length, 1, + assert.strictEqual($('.o_technical_modal footer button').length, 1, "the modal footer should only contain one button"); actionManager.destroy(); @@ -3066,7 +3066,7 @@ QUnit.module('ActionManager', { type: 'ir.actions.client', }); - assert.strictEqual($('.modal .o_test').length, 1, + assert.strictEqual($('[role="dialog"] .o_test').length, 1, "should have rendered the client action in a dialog"); assert.verifySteps(['on_attach_callback']); diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js index 9cda103eedd..e285626f763 100644 --- a/addons/web/static/tests/fields/basic_fields_tests.js +++ b/addons/web/static/tests/fields/basic_fields_tests.js @@ -1842,7 +1842,7 @@ QUnit.module('basic_fields', { // Actual flow: click on an element of the m2m to get its form view form.$('tbody td:contains(gold)').click(); - assert.strictEqual($('.modal-dialog').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, 'The modal should have opened'); assert.verifySteps([ "The view's image should have been fetched", @@ -2570,7 +2570,7 @@ QUnit.module('basic_fields', { // switch to form view form.$('.o_field_widget[name=p] .o_data_row').click(); - assert.strictEqual($('.modal .o_field_date[name=datetime]').text(), '02/07/2017', + assert.strictEqual($('[role="dialog"] .o_field_date[name=datetime]').text(), '02/07/2017', 'the datetime (date widget) should be correctly displayed in form view'); form.destroy(); @@ -2614,7 +2614,7 @@ QUnit.module('basic_fields', { // switch to form view form.$('.o_field_widget[name=p] .o_data_row').click(); - assert.strictEqual($('.modal .o_field_date[name=datetime]').text(), '02/08/2017', + assert.strictEqual($('[role="dialog"] .o_field_date[name=datetime]').text(), '02/08/2017', 'the datetime (date widget) should be correctly displayed in form view'); form.destroy(); @@ -4602,13 +4602,13 @@ QUnit.module('basic_fields', { // open the selection form.$(".o_domain_show_selection_button").click(); - assert.strictEqual($('.modal .o_list_view .o_data_row').length, 2, + assert.strictEqual($('[role="dialog"] .o_list_view .o_data_row').length, 2, "should have open a list view with 2 records in a dialog"); // click on a record -> should not open the record // we don't actually check that it doesn't open the record because even // if it tries to, it will crash as we don't define an arch in this test - $('.modal .o_list_view .o_data_row:first .o_data_cell').click(); + $('[role="dialog"] .o_list_view .o_data_row:first .o_data_cell').click(); form.destroy(); }); diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js index 9b42c518891..95b12e9137d 100644 --- a/addons/web/static/tests/fields/relational_fields_tests.js +++ b/addons/web/static/tests/fields/relational_fields_tests.js @@ -206,7 +206,7 @@ QUnit.module('relational_fields', { form.$('.o_external_button').click(); // click on the external button (should do an RPC) - assert.strictEqual($('.modal .modal-title').text().trim(), 'Open: custom label', + assert.strictEqual($('[role="dialog"] .modal-title').text().trim(), 'Open: custom label', "dialog title should display the custom string label"); // TODO: test that we can edit the record in the dialog, and that the value is correctly @@ -246,7 +246,7 @@ QUnit.module('relational_fields', { // click on the external button (should do an RPC) form.$('.o_external_button').click(); // save and close modal - $('.modal .modal-footer .btn-primary:first').click(); + $('footer.modal-footer .btn-primary:first').click(); // save form form.$buttons.find('.o_form_button_save').click(); // click next on pager @@ -315,10 +315,10 @@ QUnit.module('relational_fields', { // click on the external button (should do an RPC) form.$('.o_external_button').click(); - $('.modal input[name="foo"]').val('brandon').trigger('input'); + $('[role="dialog"] input[name="foo"]').val('brandon').trigger('input'); // save and close modal - $('.modal .modal-footer .btn-primary:first').click(); + $('footer.modal-footer .btn-primary:first').click(); // save form form.$buttons.find('.o_form_button_save').click(); // click next on pager @@ -372,7 +372,7 @@ QUnit.module('relational_fields', { assert.strictEqual(form.$('button.o_external_button:visible').length, 1, "should still have an open record button"); form.$('input.o_input').trigger('focusout'); - assert.strictEqual($('.modal button:contains(Create and edit)').length, 0, + assert.strictEqual($('[role="dialog"] button:contains(Create and edit)').length, 0, "there should not be a quick create modal"); form.destroy(); @@ -471,10 +471,10 @@ QUnit.module('relational_fields', { // open the many2one in form view and change something form.$buttons.find('.o_form_button_edit').click(); form.$('.o_external_button').click(); - $('.modal-body input[name="other_field"]').val('wood').trigger('input'); + $('main.modal-body input[name="other_field"]').val('wood').trigger('input'); // save the modal and make sure an onchange is triggered - $('.modal .modal-footer .btn-primary').first().click(); + $('footer.modal-footer .btn-primary').first().click(); assert.verifySteps(['read', 'get_formview_id', 'load_views', 'read', 'write', 'onchange', 'read']); // save the main record, and check that no extra rpcs are done (record @@ -572,20 +572,20 @@ QUnit.module('relational_fields', { form.$('.o_field_many2one input').click(); // click on 'Search More' (mouseenter required by ui-autocomplete) $dropdown.find('.o_m2o_dropdown_option:contains(Search)').mouseenter().click(); - assert.ok($('.modal .o_list_view').length, "should have opened a list view in a modal"); - assert.ok(!$('.modal .o_list_view .o_list_record_selector').length, + assert.ok($('[role="dialog"] .o_list_view').length, "should have opened a list view in a modal"); + assert.ok(!$('[role="dialog"] .o_list_view .o_list_record_selector').length, "there should be no record selector in the list view"); - assert.ok(!$('.modal .modal-footer .o_select_button').length, + assert.ok(!$('footer.modal-footer .o_select_button').length, "there should be no 'Select' button in the footer"); - assert.ok($('.modal tbody tr').length > 10, "list should contain more than 10 records"); + assert.ok($('[role="dialog"] tbody tr').length > 10, "list should contain more than 10 records"); // filter the list using the searchview - $('.modal .o_searchview_input').trigger({type: 'keypress', which: 80}); // P - $('.modal .o_searchview_input').trigger({type: 'keydown', which: 13}); // enter - assert.strictEqual($('.modal tbody tr').length, 10, + $('[role="dialog"] .o_searchview_input').trigger({type: 'keypress', which: 80}); // P + $('[role="dialog"] .o_searchview_input').trigger({type: 'keydown', which: 13}); // enter + assert.strictEqual($('[role="dialog"] tbody tr').length, 10, "list should be restricted to records containing a P (10 records)"); // choose a record - $('.modal tbody tr:contains(Partner 20)').click(); // choose record 'Partner 20' - assert.ok(!$('.modal').length, "should have closed the modal"); + $('[role="dialog"] tbody tr:contains(Partner 20)').click(); // choose record 'Partner 20' + assert.ok(!$('[role="dialog"]').length, "should have closed the modal"); assert.ok(!$dropdown.is(':visible'), 'should have closed the dropdown'); assert.strictEqual(form.$('.o_field_many2one input').val(), 'Partner 20', 'value of the m2o should have been correctly updated'); @@ -1690,7 +1690,7 @@ QUnit.module('relational_fields', { form.$('.o_data_cell').click(); form.$('.o_external_button').click(); - var $modal = $('.modal-dialog'); + var $modal = $('[role="dialog"]'); assert.equal($modal.length, 1, 'There should be 1 modal opened'); @@ -1702,7 +1702,7 @@ QUnit.module('relational_fields', { {position: 'top'}); // Saving the modal and then the original model - $modal.find('.modal-footer .btn-primary').click(); + $modal.find('footer.modal-footer .btn-primary').click(); form.$buttons.find('.o_form_button_save').click(); assert.verifySteps(['onchange sequence', 'partner_type write']); @@ -1900,7 +1900,7 @@ QUnit.module('relational_fields', { form.$('.o_field_many2one input').focus(); form.$('.o_field_many2one input').val('new partner').trigger('keyup').trigger('focusout'); - $('.modal .modal-footer .btn-primary').first().click(); + $('footer.modal-footer .btn-primary').first().click(); form.destroy(); }); @@ -1928,14 +1928,14 @@ QUnit.module('relational_fields', { // cancel the many2one creation with Cancel button form.$('.o_field_many2one input').focus().val('new product').trigger('keyup').trigger('blur'); - assert.strictEqual($('.modal').length, 1, "there should be one opened modal"); - $('.modal .modal-footer .btn:contains(Cancel)').click(); + assert.strictEqual($('[role="dialog"]').length, 1, "there should be one opened modal"); + $('footer.modal-footer .btn:contains(Cancel)').click(); assert.strictEqual(form.$('.o_field_many2one input').val(), "", 'the many2one should not set a value as its creation has been cancelled (with Cancel button)'); // cancel the many2one creation with Close button form.$('.o_field_many2one input').focus().val('new product').trigger('keyup').trigger('blur'); - $('.modal .modal-header button').click(); + $('header.modal-header button').click(); assert.strictEqual(form.$('.o_field_many2one input').val(), "", 'the many2one should not set a value as its creation has been cancelled (with Close button)'); @@ -1944,16 +1944,16 @@ QUnit.module('relational_fields', { form.$('.o_field_many2one input').autocomplete('widget').find('a').first().click(); assert.strictEqual(form.$('input').val(), "xphone", "should have selected xphone"); form.$('.o_field_many2one input').focus().val('new product').trigger('keyup').trigger('blur'); - assert.strictEqual($('.modal').length, 1, "there should be one opened modal"); - $('.modal .modal-footer .btn:contains(Cancel)').click(); + assert.strictEqual($('[role="dialog"]').length, 1, "there should be one opened modal"); + $('footer.modal-footer .btn:contains(Cancel)').click(); assert.strictEqual(form.$('.o_field_many2one input').val(), "xphone", 'should have restored the many2one with its previous selected value (xphone)'); // confirm the many2one creation form.$('.o_field_many2one input').focus(); form.$('.o_field_many2one input').val('new partner').trigger('keyup').trigger('blur'); - $('.modal .modal-footer .btn-primary').click(); - assert.strictEqual($('.modal .o_form_view').length, 1, + $('footer.modal-footer .btn-primary').click(); + assert.strictEqual($('[role="dialog"] .o_form_view').length, 1, 'a new modal should be opened and contain a form view'); form.destroy(); @@ -1976,7 +1976,7 @@ QUnit.module('relational_fields', { form.$('.o_field_many2one input').focus(); form.$('.o_field_many2one input').val('new partner').trigger('keyup').trigger('focusout'); - assert.strictEqual($('.modal').length, 0, "should not display the create modal"); + assert.strictEqual($('[role="dialog"]').length, 0, "should not display the create modal"); form.destroy(); }); @@ -2019,14 +2019,14 @@ QUnit.module('relational_fields', { "there should be an external button displayed"); form.$('.o_field_many2one .o_external_button').click(); - assert.strictEqual($('.modal .o_form_view.o_form_readonly').length, 1, + assert.strictEqual($('[role="dialog"] .o_form_view.o_form_readonly').length, 1, "there should be a readonly form view opened"); - $('.modal .o_form_button_cancel').click(); + $('[role="dialog"] .o_form_button_cancel').click(); form.$('.o_field_many2one input').val('new product').trigger('keyup').trigger('focusout'); - assert.strictEqual($('.modal').length, 0, "should not display the create modal"); + assert.strictEqual($('[role="dialog"]').length, 0, "should not display the create modal"); form.destroy(); }); @@ -2143,10 +2143,10 @@ QUnit.module('relational_fields', { })); concurrency.delay(0).then(function() { $input.blur(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "should have one modal in body"); // Check that discarding clears $input - $('.modal .o_form_button_cancel').click(); + $('[role="dialog"] .o_form_button_cancel').click(); assert.strictEqual($input.val(), '', "the field should be empty"); form.destroy(); @@ -2202,7 +2202,7 @@ QUnit.module('relational_fields', { which: $.ui.keyCode.ENTER, keyCode: $.ui.keyCode.ENTER, })); - assert.strictEqual($('div.modal').length, 0, "should not have any modal in DOM"); + assert.strictEqual($('[role="dialog"]').length, 0, "should not have any modal in DOM"); assert.verifySteps(['name_search', 'onchange', 'write', 'read']); list.destroy(); relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY; @@ -2258,7 +2258,7 @@ QUnit.module('relational_fields', { keyCode: $.ui.keyCode.ENTER, })); def.resolve(); - assert.strictEqual($('div.modal').length, 0, "should not have any modal in DOM"); + assert.strictEqual($('[role="dialog"]').length, 0, "should not have any modal in DOM"); assert.verifySteps(['name_search', 'onchange', 'write', 'read']); list.destroy(); relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY; @@ -2409,15 +2409,15 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('.o_data_row td:contains(first record)').click(); form.$('.o_external_button').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "should have one modal in body"); // Changing the 'trululu' value - $('.modal input[name="display_name"]').val('test').trigger('input'); - $('.modal button.btn-primary').click(); + $('[role="dialog"] input[name="display_name"]').val('test').trigger('input'); + $('[role="dialog"] button.btn-primary').click(); // Test whether the value has changed - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, "the modal should be closed"); assert.equal(form.$('.o_data_cell:contains(test)').text(), 'test', "the partner name should have been updated to 'test'"); @@ -2504,7 +2504,7 @@ QUnit.module('relational_fields', { form.$buttons.find('.btn.btn-primary.btn-sm.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - var $modal = $('.modal-dialog.modal-lg'); + var $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'There should be one modal'); @@ -2532,7 +2532,7 @@ QUnit.module('relational_fields', { // Third round: re-add 1 records form.$('.o_field_x2many_list_row_add a').click(); - $modal = $('.modal-dialog.modal-lg'); + $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'There should be one modal'); @@ -3370,7 +3370,7 @@ QUnit.module('relational_fields', { assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "blurp#21#22#23#24#25#26#27#28#29", "should display the records in order with the changes"); - $('.modal .modal-footer button:first').click(); + $('footer.modal-footer button:first').click(); assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#21#22#23#24#25#26#27#28#29", "should cancel changes and display the records in order"); @@ -3402,7 +3402,7 @@ QUnit.module('relational_fields', { assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#39#40#41#42#43#44#45#46#47", "should display the records in order after resequence"); - $('.modal .modal-footer button:first').click(); + $('footer.modal-footer button:first').click(); assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#21#22#23#24#25#26#27#28#29", "should cancel changes and display the records in order"); @@ -3750,62 +3750,62 @@ QUnit.module('relational_fields', { // in its relation form.$('.o_data_row').click(); - assert.strictEqual($('.modal').length, 1, "should have opened a dialog"); - assert.strictEqual($('.modal .o_data_row').length, 0, + assert.strictEqual($('[role="dialog"]').length, 1, "should have opened a dialog"); + assert.strictEqual($('[role="dialog"] .o_data_row').length, 0, "there should be no record in the one2many in the dialog"); // add a many2many subrecord - $('.modal .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 2, + assert.strictEqual($('[role="dialog"]').length, 2, "should have opened a second dialog"); // select a many2many subrecord - $('.modal:nth(1) .o_list_view .o_data_cell:first').click(); + $('[role="dialog"]:nth(1) .o_list_view .o_data_cell:first').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "second dialog should be closed"); - assert.strictEqual($('.modal .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 1, "there should be one record in the one2many in the dialog"); - assert.notOk($('.modal .o_x2m_control_panel .o_cp_pager div').is(':visible'), + assert.notOk($('[role="dialog"] .o_x2m_control_panel .o_cp_pager div').is(':visible'), 'm2m pager should be hidden'); // click on 'Save & Close' - $('.modal .modal-footer .btn-primary:first').click(); + $('footer.modal-footer .btn-primary:first').click(); - assert.strictEqual($('.modal').length, 0, "dialog should be closed"); + assert.strictEqual($('[role="dialog"]').length, 0, "dialog should be closed"); // reopen o2m record, and another m2m subrecord in its relation, but // discard the changes form.$('.o_data_row').click(); - assert.strictEqual($('.modal').length, 1, "should have opened a dialog"); - assert.strictEqual($('.modal .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "should have opened a dialog"); + assert.strictEqual($('[role="dialog"] .o_data_row').length, 1, "there should be one record in the one2many in the dialog"); // add another m2m subrecord - $('.modal .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 2, + assert.strictEqual($('[role="dialog"]').length, 2, "should have opened a second dialog"); - $('.modal:nth(1) .o_list_view .o_data_cell:first').click(); + $('[role="dialog"]:nth(1) .o_list_view .o_data_cell:first').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "second dialog should be closed"); - assert.strictEqual($('.modal .o_data_row').length, 2, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 2, "there should be two records in the one2many in the dialog"); // click on 'Discard' - $('.modal .modal-footer .btn-default').click(); + $('footer.modal-footer .btn-default').click(); - assert.strictEqual($('.modal').length, 0, "dialog should be closed"); + assert.strictEqual($('[role="dialog"]').length, 0, "dialog should be closed"); // reopen o2m record to check that second changes have properly been discarded form.$('.o_data_row').click(); - assert.strictEqual($('.modal').length, 1, "should have opened a dialog"); - assert.strictEqual($('.modal .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "should have opened a dialog"); + assert.strictEqual($('[role="dialog"] .o_data_row').length, 1, "there should be one record in the one2many in the dialog"); form.destroy(); @@ -4158,8 +4158,8 @@ QUnit.module('relational_fields', { checkRead = true; form.$buttons.find('.o_form_button_edit').click(); form.$('.o-kanban-button-new').click(); - $('.modal input').val('new record').trigger('input'); - $('.modal .modal-footer .btn-primary:first').click(); // save and close + $('[role="dialog"] input').val('new record').trigger('input'); + $('footer.modal-footer .btn-primary:first').click(); // save and close // checks assert.strictEqual(readIDs, undefined, "should not have read any record"); assert.strictEqual(form.$('span:contains(new record)').length, 0, @@ -4195,8 +4195,8 @@ QUnit.module('relational_fields', { readIDs = undefined; // add and delete a record in page 1 form.$('.o-kanban-button-new').click(); - $('.modal input').val('new record page 1').trigger('input'); - $('.modal .modal-footer .btn-primary:first').click(); // save and close + $('[role="dialog"] input').val('new record page 1').trigger('input'); + $('footer.modal-footer .btn-primary:first').click(); // save and close assert.strictEqual(form.$('.o_kanban_record:first span:contains(relational record 11)').length, 1, 'first record should be the one with id 11 (next checks rely on that)'); form.$('.delete_icon:first').click(); @@ -4210,8 +4210,8 @@ QUnit.module('relational_fields', { readIDs = undefined; form.$('.delete_icon:first').click(); form.$('.o-kanban-button-new').click(); - $('.modal input').val('new record page 2').trigger('input'); - $('.modal .modal-footer .btn-primary:first').click(); // save and close + $('[role="dialog"] input').val('new record page 2').trigger('input'); + $('footer.modal-footer .btn-primary:first').click(); // save and close assert.strictEqual(readIDs, undefined, "should not have read any record"); // checks assert.strictEqual(form.$('.o_kanban_record:not(".o_kanban_ghost")').length, 5, @@ -4255,13 +4255,13 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); $('input[name="turtle_int"]').val('5').trigger('input'); - $('.modal-footer button.btn-primary').first().click(); + $('footer.modal-footer button.btn-primary').first().click(); assert.strictEqual(form.$('tbody tr:eq(1) td.o_data_cell').text(), '5', 'should display 5 in the foo field'); form.$('tbody tr:eq(1) td.o_data_cell').click(); $('input[name="turtle_int"]').val('3').trigger('input'); - $('.modal-footer button.btn-primary').first().click(); + $('footer.modal-footer button.btn-primary').first().click(); assert.strictEqual(form.$('tbody tr:eq(1) td.o_data_cell').text(), '3', 'should now display 3 in the foo field'); form.destroy(); @@ -4358,7 +4358,7 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_cancel').click(); assert.strictEqual(form.$('.o_field_one2many tbody td').first().text(), 'new value', "changes shouldn't have been discarded yet, waiting for user confirmation"); - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); assert.strictEqual(form.$('.o_field_one2many tbody td').first().text(), 'relational record 1', "display name of first record in o2m list should be 'relational record 1'"); @@ -4557,15 +4557,15 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.oe_kanban_global_click').click(); - $('.modal .o_form_view input').val('new name').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save + $('[role="dialog"] .o_form_view input').val('new name').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save assert.strictEqual(form.$('.o_kanban_record span:first').text(), 'new name', 'value of subrecord should have been updated'); // create a new subrecord form.$('.o-kanban-button-new').click(); - $('.modal .o_form_view input').val('new subrecord 1').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save and close + $('[role="dialog"] .o_form_view input').val('new subrecord 1').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save and close assert.strictEqual(form.$('.o_kanban_record:not(.o_kanban_ghost)').length, 2, 'should contain 2 records'); assert.strictEqual(form.$('.o_kanban_record:nth(1) span').text(), 'new subrecord 1', @@ -4573,10 +4573,10 @@ QUnit.module('relational_fields', { // create two new subrecords form.$('.o-kanban-button-new').click(); - $('.modal .o_form_view input').val('new subrecord 2').trigger('input'); - $('.modal .modal-footer .btn-primary:nth(1)').click(); // save and new - $('.modal .o_form_view input').val('new subrecord 3').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save and close + $('[role="dialog"] .o_form_view input').val('new subrecord 2').trigger('input'); + $('footer.modal-footer .btn-primary:nth(1)').click(); // save and new + $('[role="dialog"] .o_form_view input').val('new subrecord 3').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save and close assert.strictEqual(form.$('.o_kanban_record:not(.o_kanban_ghost)').length, 4, 'should contain 4 records'); @@ -4742,8 +4742,8 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.o_list_view tbody tr:first() td:eq(1)').click(); - $('.modal .o_form_view input').val('new name').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save + $('[role="dialog"] .o_form_view input').val('new name').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save assert.strictEqual(form.$('.o_list_view tbody td:first()').text(), 'new name', 'value of subrecord should have been updated'); assert.strictEqual(nbWrite, 0, "should not have write anything in DB"); @@ -4789,9 +4789,9 @@ QUnit.module('relational_fields', { '"Add an item" link should not be available in readonly'); form.$('.o_list_view tbody td:first()').click(); - assert.ok($('.modal .o_form_readonly').length, + assert.ok($('[role="dialog"] .o_form_readonly').length, 'in readonly, clicking on a subrecord should open it in readonly in a dialog'); - $('.modal .o_form_button_cancel').click(); // close the dialog + $('[role="dialog"] .o_form_button_cancel').click(); // close the dialog form.$buttons.find('.o_form_button_edit').click(); @@ -4800,7 +4800,7 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.o_list_view tbody td:first()').click(); - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, 'in edit, clicking on a subrecord should not open a dialog'); assert.ok(form.$('.o_list_view tbody tr:first()').hasClass('o_selected_row'), 'first row should be in edition'); @@ -4898,7 +4898,7 @@ QUnit.module('relational_fields', { // cancel the edition form.$buttons.find('.o_form_button_cancel').click(); - $('.modal-footer button.btn-primary').first().click(); + $('footer.modal-footer button.btn-primary').first().click(); assert.strictEqual(form.$('tr.o_data_row').length, 1, "should have 1 data rows"); @@ -5054,7 +5054,7 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_cancel').click(); // confirm the discard operation - $('.modal .modal-footer .btn-primary').click(); // click on confirm + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(form.$('.o_cp_pager').text().trim(), '1-3 / 4', "pager should still be visible"); @@ -5129,7 +5129,7 @@ QUnit.module('relational_fields', { "pager should still display the correct total"); // click on cancel - $('.modal .modal-footer .btn-default').click(); // click on cancel + $('footer.modal-footer .btn-default').click(); // click on cancel assert.strictEqual(form.$('.o_cp_pager').text().trim(), '1-3 / 4', "pager should again display the correct total"); @@ -5169,7 +5169,7 @@ QUnit.module('relational_fields', { // discard form.$buttons.find('.o_form_button_cancel').click(); - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); assert.strictEqual(form.$('tr.o_data_row').length, 1, "should have 1 data row"); @@ -5216,17 +5216,17 @@ QUnit.module('relational_fields', { // click elsewhere, form.$('label.o_form_label').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, 'a confirmation model should be opened'); // click on cancel, the line should still be selected - $('.modal .modal-footer button.btn-default').click(); + $('footer.modal-footer button.btn-default').click(); assert.strictEqual(form.$('tr.o_data_row.o_selected_row').length, 1, "should still have 1 selected data row"); // click elsewhere, and click on ok (on the confirmation dialog) form.$('label.o_form_label').click(); - $('.modal .modal-footer button.btn-primary').click(); + $('footer.modal-footer button.btn-primary').click(); assert.strictEqual(form.$('tr.o_data_row').length, 0, "should have 0 data rows (invalid line has been discarded"); @@ -5427,17 +5427,17 @@ QUnit.module('relational_fields', { }); form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_data_row.o_selected_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_data_row.o_selected_row').length, 1, "there should be a row in edition in the dialog"); // trigger keydown ESCAPE in the edited row - $('.modal .o_data_cell input').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE}); + $('[role="dialog"] .o_data_cell input').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE}); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "dialog should still be open"); - assert.strictEqual($('.modal .o_data_row').length, 0, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 0, "the row should have been removed"); form.destroy(); @@ -6042,8 +6042,8 @@ QUnit.module('relational_fields', { // click to create a subrecord form.$('tbody td.o_field_x2many_list_row_add a').click(); - $('.modal input').val('new record').trigger('input'); - $('.modal .modal-footer button:eq(0)').click(); // save and close + $('[role="dialog"] input').val('new record').trigger('input'); + $('footer.modal-footer button:eq(0)').click(); // save and close assert.ok(!form.$('.o_x2m_control_panel .o_cp_pager div').is(':visible'), 'o2m pager should be hidden'); @@ -6098,14 +6098,14 @@ QUnit.module('relational_fields', { form.$('tbody td.o_field_x2many_list_row_add a').click(); - $('.modal .o_field_many2one input').click(); + $('[role="dialog"] .o_field_many2one input').click(); - var $dropdown = $('.modal .o_field_many2one input').autocomplete('widget'); + var $dropdown = $('[role="dialog"] .o_field_many2one input').autocomplete('widget'); $dropdown.find('li:eq(1) a').mouseenter(); $dropdown.find('li:eq(1) a').click(); - $('.modal .modal-footer button:eq(0)').click(); // save and close + $('footer.modal-footer button:eq(0)').click(); // save and close assert.strictEqual(form.$('tbody td:contains(xpad)').length, 1, "should display 'xpad' on a td"); @@ -6157,16 +6157,16 @@ QUnit.module('relational_fields', { form.$('tbody td.o_field_x2many_list_row_add a').click(); // write in the many2one field, value = 37 (xphone) - $('.modal .o_field_many2one input').click(); - var $dropdown = $('.modal .o_field_many2one input').autocomplete('widget'); + $('[role="dialog"] .o_field_many2one input').click(); + var $dropdown = $('[role="dialog"] .o_field_many2one input').autocomplete('widget'); $dropdown.find('li:eq(0) a').mouseenter(); $dropdown.find('li:eq(0) a').click(); // write in the integer field - $('.modal .modal-body input.o_field_widget').val('123').trigger('input'); + $('main.modal-body input.o_field_widget').val('123').trigger('input'); // save and close - $('.modal .modal-footer button:eq(0)').click(); + $('footer.modal-footer button:eq(0)').click(); assert.strictEqual(form.$('tbody td:contains(xphone)').length, 1, "should display 'xphone' in a td"); @@ -6174,28 +6174,28 @@ QUnit.module('relational_fields', { // reopen the record in form view form.$('tbody td:contains(xphone)').click(); - assert.strictEqual($('.modal .modal-body input').val(), "xphone", + assert.strictEqual($('main.modal-body input').val(), "xphone", "should display 'xphone' in an input"); - $('.modal .modal-body input.o_field_widget').val('456').trigger('input'); + $('main.modal-body input.o_field_widget').val('456').trigger('input'); // discard - $('.modal .modal-footer span:contains(Discard)').click(); + $('footer.modal-footer span:contains(Discard)').click(); // reopen the record in form view form.$('tbody td:contains(xphone)').click(); - assert.strictEqual($('.modal .modal-body input.o_field_widget').val(), "123", + assert.strictEqual($('main.modal-body input.o_field_widget').val(), "123", "should display 123 (previous change has been discarded)"); // write in the many2one field, value = 41 (xpad) - $('.modal .o_field_many2one input').click(); - $dropdown = $('.modal .o_field_many2one input').autocomplete('widget'); + $('[role="dialog"] .o_field_many2one input').click(); + $dropdown = $('[role="dialog"] .o_field_many2one input').autocomplete('widget'); $dropdown.find('li:eq(1) a').mouseenter(); $dropdown.find('li:eq(1) a').click(); // save and close - $('.modal .modal-footer button:eq(0)').click(); + $('footer.modal-footer button:eq(0)').click(); assert.strictEqual(form.$('tbody td:contains(xpad)').length, 1, "should display 'xpad' in a td"); @@ -6245,7 +6245,7 @@ QUnit.module('relational_fields', { form.$('tr.o_data_row:eq(0) td:contains(xphone)').click(); // write in the many2one field - $('.modal .o_field_many2one input').click(); + $('[role="dialog"] .o_field_many2one input').click(); form.destroy(); }); @@ -6513,29 +6513,29 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_data_row').length, 2, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 2, "sould have 2 records in the select view (the last one is not displayed because it is already selected)"); - $('.modal .o_data_row:first .o_list_record_selector input').click(); - $('.modal .o_select_button').click(); + $('[role="dialog"] .o_data_row:first .o_list_record_selector input').click(); + $('[role="dialog"] .o_select_button').click(); $('.o_form_button_save').click(); form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 1, "sould have 1 record in the select view"); - $('.modal-footer button:eq(1)').click(); - $('.modal input.o_field_widget[name="turtle_foo"]').val('tototo').trigger('input'); - $('.modal input.o_field_widget[name="turtle_int"]').val(50).trigger('input'); - var $many2one = $('.modal [name="product_id"] input').click(); + $('footer.modal-footer button:eq(1)').click(); + $('[role="dialog"] input.o_field_widget[name="turtle_foo"]').val('tototo').trigger('input'); + $('[role="dialog"] input.o_field_widget[name="turtle_int"]').val(50).trigger('input'); + var $many2one = $('[role="dialog"] [name="product_id"] input').click(); var $dropdown = $many2one.autocomplete('widget'); $dropdown.find('li:first a').mouseenter(); $dropdown.find('li:first a').click(); - $('.modal-footer button:contains(&):first').click(); + $('footer.modal-footer button:contains(&):first').click(); - assert.strictEqual($('.modal').length, 0, "sould close the modals"); + assert.strictEqual($('[role="dialog"]').length, 0, "sould close the modals"); assert.strictEqual(form.$('.o_data_row').length, 3, "sould have 3 records in one2many list"); @@ -6593,34 +6593,34 @@ QUnit.module('relational_fields', { }); form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .modal-title').first().text().trim(), 'Open: one2many turtle field', + assert.strictEqual($('[role="dialog"] .modal-title').first().text().trim(), 'Open: one2many turtle field', "modal should use the python field string as title"); - $('.modal .o_form_button_cancel').click(); + $('[role="dialog"] .o_form_button_cancel').click(); form.$buttons.find('.o_form_button_edit').click(); // edit the first one2many record form.$('.o_data_row:first').click(); - var $many2one = $('.modal [name="product_id"] input').click(); + var $many2one = $('[role="dialog"] [name="product_id"] input').click(); var $dropdown = $many2one.autocomplete('widget'); $dropdown.find('li:first a').mouseenter(); $dropdown.find('li:first a').click(); - $('.modal-footer button:first').click(); + $('footer.modal-footer button:first').click(); $('.o_form_button_save').click(); // don't save anything because the one2many does not change // add a one2many record form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_data_row:first .o_list_record_selector input').click(); - $('.modal .o_select_button').click(); + $('[role="dialog"] .o_data_row:first .o_list_record_selector input').click(); + $('[role="dialog"] .o_select_button').click(); // edit the second one2many record form.$('.o_data_row:eq(1)').click(); - $many2one = $('.modal [name="product_id"] input').click(); + $many2one = $('[role="dialog"] [name="product_id"] input').click(); $dropdown = $many2one.autocomplete('widget'); $dropdown.find('li:first a').mouseenter(); $dropdown.find('li:first a').click(); - $('.modal-footer button:first').click(); + $('footer.modal-footer button:first').click(); $('.o_form_button_save').click(); @@ -6812,10 +6812,10 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('tbody td.o_field_x2many_list_row_add a').click(); - $('.modal-footer button.btn-primary').first().click(); + $('footer.modal-footer button.btn-primary').first().click(); - assert.strictEqual($('.modal').length, 1, "should still have an open modal"); - assert.strictEqual($('.modal tbody label.o_field_invalid').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "should still have an open modal"); + assert.strictEqual($('[role="dialog"] tbody label.o_field_invalid').length, 1, "should have displayed invalid fields"); form.destroy(); }); @@ -7011,9 +7011,9 @@ QUnit.module('relational_fields', { }); form.$('.o_field_one2many .o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 1, "form view dialog should be opened"); - $('.modal-body input[name="model_name"]').val('partner').trigger('input'); - $('.modal-footer button:first').click(); + assert.strictEqual($('[role="dialog"]').length, 1, "form view dialog should be opened"); + $('main.modal-body input[name="model_name"]').val('partner').trigger('input'); + $('footer.modal-footer button:first').click(); assert.strictEqual(form.$('.o_field_one2many tbody tr:first').text(), "coucouhas changed[]", "the onchange should create one new record and remove the existing"); @@ -7112,9 +7112,9 @@ QUnit.module('relational_fields', { form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .o_field_widget').text(), "xphone", + assert.strictEqual($('[role="dialog"] .o_field_widget').text(), "xphone", 'should display the form view dialog with the many2one value'); - $('.modal-footer button').click(); // close the modal + $('footer.modal-footer button').click(); // close the modal form.$buttons.find('.o_form_button_edit').click(); @@ -7368,7 +7368,7 @@ QUnit.module('relational_fields', { form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .o_field_widget[name="partner_ids"] .o_list_view').length, 1, + assert.strictEqual($('[role="dialog"] .o_field_widget[name="partner_ids"] .o_list_view').length, 1, 'should display many2many list view in the modal'); form.destroy(); @@ -7400,7 +7400,7 @@ QUnit.module('relational_fields', { form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .o_field_widget[name="turtle_foo"]').text(), 'blip', + assert.strictEqual($('[role="dialog"] .o_field_widget[name="turtle_foo"]').text(), 'blip', 'should open the modal and display the form field'); form.destroy(); @@ -7449,14 +7449,14 @@ QUnit.module('relational_fields', { form.$('.o_data_row:first').click(); // edit first record - var $input = $('.modal .o_field_many2manytags input'); + var $input = $('[role="dialog"] .o_field_many2manytags input'); $input.click(); // opens the dropdown $input.autocomplete('widget').find('li').click(); // add 'first record' // add a many2many tag and save - $('.modal .o_field_x2many_list_row_add a').click(); - $('.modal .o_field_widget[name=name]').val('test').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_field_widget[name=name]').val('test').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save form.$buttons.find('.o_form_button_save').click(); @@ -7510,13 +7510,13 @@ QUnit.module('relational_fields', { form.$('.o_external_button').click(); // click on add, to add a new partner in the m2m - $('.modal .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); // select the partner_type 'gold' (this closes the 2nd modal) - $('.modal td:contains(gold)').click(); + $('[role="dialog"] td:contains(gold)').click(); // confirm the changes in the modal - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); form.$buttons.find('.o_form_button_save').click(); form.destroy(); @@ -7585,7 +7585,7 @@ QUnit.module('relational_fields', { form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .o_field_widget[name="turtle_foo"]').text(), 'blip', + assert.strictEqual($('[role="dialog"] .o_field_widget[name="turtle_foo"]').text(), 'blip', 'should open the modal and display the form field'); form.destroy(); @@ -8080,7 +8080,7 @@ QUnit.module('relational_fields', { // try to add a second line and check that it is correctly waiting // for the onchange to return form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 0, "no modal should be displayed"); + assert.strictEqual($('[role="dialog"]').length, 0, "no modal should be displayed"); assert.strictEqual($('.o_field_invalid').length, 0, "no field should be marked as invalid"); assert.strictEqual(form.$('.o_data_row').length, 1, @@ -8384,11 +8384,11 @@ QUnit.module('relational_fields', { form.$('.o_data_row td:first').click(); // open the record - assert.strictEqual($('.modal .o_field_many2manytags[name="timmy"]').length, 1, + assert.strictEqual($('[role="dialog"] .o_field_many2manytags[name="timmy"]').length, 1, "timmy should be displayed in the form view"); - assert.strictEqual($('.modal .o_field_many2manytags[name="timmy"] .badge').length, 1, + assert.strictEqual($('[role="dialog"] .o_field_many2manytags[name="timmy"] .badge').length, 1, "m2mtags should contain one tag"); - assert.strictEqual($('.modal .o_field_many2manytags[name="timmy"] .o_badge_text').text(), + assert.strictEqual($('[role="dialog"] .o_field_many2manytags[name="timmy"] .o_badge_text').text(), 'gold', "tag name should have been correctly loaded"); form.destroy(); @@ -8464,10 +8464,10 @@ QUnit.module('relational_fields', { }); form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_field_x2many_list_row_add a').click(); - $('.modal .o_data_cell input').val('new record').trigger('input'); + $('[role="dialog"] .o_field_x2many_list_row_add a').click(); + $('[role="dialog"] .o_data_cell input').val('new record').trigger('input'); checkOnchange = true; - $('.modal .modal-footer .btn-primary').click(); // save (should trigger the onchange) + $('footer.modal-footer .btn-primary').click(); // save (should trigger the onchange) form.destroy(); }); @@ -8788,7 +8788,7 @@ QUnit.module('relational_fields', { assert.strictEqual(form.$('.o_data_row.o_selected_row').length, 1, "line should not have been removed and should still be in edition"); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "a confirmation dialog should be opened"); assert.ok(form.$('.o_field_widget[name=int_field]').hasClass('o_field_invalid'), "should indicate that int_field is invalid"); @@ -8986,9 +8986,9 @@ QUnit.module('relational_fields', { // open the new subrecord to check the value of the nested o2m, and to // ensure that it will be saved form.$('.o_data_cell:first').click(); - assert.strictEqual($('.modal .o_data_cell').text(), 'test nested', + assert.strictEqual($('[role="dialog"] .o_data_cell').text(), 'test nested', "should have added the new row to the nested one2many"); - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); form.$buttons.find('.o_form_button_save').click(); @@ -9276,26 +9276,26 @@ QUnit.module('relational_fields', { // add a new record form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_field_widget').val('new record').trigger('input'); - $('.modal .modal-footer .btn-primary:first').click(); // Save & Close + $('[role="dialog"] .o_field_widget').val('new record').trigger('input'); + $('footer.modal-footer .btn-primary:first').click(); // Save & Close assert.strictEqual(form.$('.o_data_row .o_data_cell').text(), 'new record', "should display the new record"); // reopen freshly added record and edit it form.$('.o_data_row .o_data_cell').click(); - $('.modal .o_field_widget').val('new record edited').trigger('input'); + $('[role="dialog"] .o_field_widget').val('new record edited').trigger('input'); // save it, and choose to directly create another record - $('.modal .modal-footer .btn-primary:nth(1)').click(); // Save & New + $('footer.modal-footer .btn-primary:nth(1)').click(); // Save & New - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "the model should still be open"); - assert.strictEqual($('.modal .o_field_widget').text(), '', + assert.strictEqual($('[role="dialog"] .o_field_widget').text(), '', "should have cleared the input"); - $('.modal .o_field_widget').val('another new record').trigger('input'); - $('.modal .modal-footer .btn-primary:first').click(); // Save & Close + $('[role="dialog"] .o_field_widget').val('another new record').trigger('input'); + $('footer.modal-footer .btn-primary:first').click(); // Save & Close assert.strictEqual(form.$('.o_data_row .o_data_cell').text(), 'new record editedanother new record', "should display the two records"); @@ -9461,19 +9461,19 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.oe_kanban_global_click:first()').click(); - $('.modal .o_form_view input').val('new name').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save + $('[role="dialog"] .o_form_view input').val('new name').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save assert.strictEqual(form.$('.o_kanban_record:first() span').text(), 'new name', 'value of subrecord should have been updated'); // add subrecords // -> single select form.$('.o_field_many2many .o-kanban-button-new').click(); - assert.ok($('.modal .o_list_view').length, "should have opened a list view in a modal"); - assert.strictEqual($('.modal .o_list_view tbody .o_list_record_selector').length, 3, + assert.ok($('[role="dialog"] .o_list_view').length, "should have opened a list view in a modal"); + assert.strictEqual($('[role="dialog"] .o_list_view tbody .o_list_record_selector').length, 3, "list view should contain 3 records"); - $('.modal .o_list_view tbody tr:contains(red)').click(); // select red - assert.ok(!$('.modal .o_list_view').length, "should have closed the modal"); + $('[role="dialog"] .o_list_view tbody tr:contains(red)').click(); // select red + assert.ok(!$('[role="dialog"] .o_list_view').length, "should have closed the modal"); assert.strictEqual(form.$('.o_kanban_record:not(.o_kanban_ghost)').length, 3, 'kanban should now contain 3 records'); assert.ok(form.$('.o_kanban_record:contains(red)').length, @@ -9481,23 +9481,23 @@ QUnit.module('relational_fields', { // -> multiple select form.$('.o_field_many2many .o-kanban-button-new').click(); - assert.ok($('.modal .o_select_button').prop('disabled'), "select button should be disabled"); - assert.strictEqual($('.modal .o_list_view tbody .o_list_record_selector').length, 2, + assert.ok($('[role="dialog"] .o_select_button').prop('disabled'), "select button should be disabled"); + assert.strictEqual($('[role="dialog"] .o_list_view tbody .o_list_record_selector').length, 2, "list view should contain 2 records"); - $('.modal .o_list_view thead .o_list_record_selector input').click(); // select all - $('.modal .o_select_button').click(); // validate selection - assert.ok(!$('.modal .o_select_button').prop('disabled'), "select button should be enabled"); - assert.ok(!$('.modal .o_list_view').length, "should have closed the modal"); + $('[role="dialog"] .o_list_view thead .o_list_record_selector input').click(); // select all + $('[role="dialog"] .o_select_button').click(); // validate selection + assert.ok(!$('[role="dialog"] .o_select_button').prop('disabled'), "select button should be enabled"); + assert.ok(!$('[role="dialog"] .o_list_view').length, "should have closed the modal"); assert.strictEqual(form.$('.o_kanban_record:not(.o_kanban_ghost)').length, 5, 'kanban should now contain 5 records'); // -> created record form.$('.o_field_many2many .o-kanban-button-new').click(); - $('.modal .modal-footer .btn-primary:nth(1)').click(); // click on 'Create' - assert.ok($('.modal .o_form_view.o_form_editable').length, + $('footer.modal-footer .btn-primary:nth(1)').click(); // click on 'Create' + assert.ok($('[role="dialog"] .o_form_view.o_form_editable').length, "should have opened a form view in edit mode, in a modal"); - $('.modal .o_form_view input').val('A new type').trigger('input'); - $('.modal:nth(1) .modal-footer .btn-primary:first()').click(); // click on 'Save & Close' - assert.ok(!$('.modal').length, "should have closed both modals"); + $('[role="dialog"] .o_form_view input').val('A new type').trigger('input'); + $('[role="dialog"]:nth(1) footer .btn-primary:first()').click(); // click on 'Save & Close' + assert.ok(!$('[role="dialog"]').length, "should have closed both modals"); assert.strictEqual(form.$('.o_kanban_record:not(.o_kanban_ghost)').length, 6, 'kanban should now contain 6 records'); assert.ok(form.$('.o_kanban_record:contains(A new type)').length, @@ -9592,7 +9592,7 @@ QUnit.module('relational_fields', { 'delete icon should be visible in edit'); form.$('.o-kanban-button-new').click(); // click on 'Add' - assert.strictEqual($('.modal .modal-footer .btn-primary').length, 1, // only button 'Select' + assert.strictEqual($('footer.modal-footer .btn-primary').length, 1, // only button 'Select' '"Create" button should not be available in the modal'); form.destroy(); @@ -9655,19 +9655,19 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.o_list_view tbody tr:first()').click(); - $('.modal .o_form_view input').val('new name').trigger('input'); - $('.modal .modal-footer .btn-primary').click(); // save + $('[role="dialog"] .o_form_view input').val('new name').trigger('input'); + $('footer.modal-footer .btn-primary').click(); // save assert.strictEqual(form.$('.o_list_view tbody td:first()').text(), 'new name', 'value of subrecord should have been updated'); // add new subrecords form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_list_view').length, 1, + assert.strictEqual($('[role="dialog"] .o_list_view').length, 1, "a modal should be open"); - assert.strictEqual($('.modal .o_list_view .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_list_view .o_data_row').length, 1, "the list should contain one row"); - $('.modal .o_list_view .o_data_row').click(); // select a record - assert.strictEqual($('.modal .o_list_view').length, 0, + $('[role="dialog"] .o_list_view .o_data_row').click(); // select a record + assert.strictEqual($('[role="dialog"] .o_list_view').length, 0, "the modal should be closed"); assert.strictEqual(form.$('.o_list_view td.o_list_number').length, 3, 'should contain 3 subrecords'); @@ -9758,7 +9758,7 @@ QUnit.module('relational_fields', { // edit existing subrecord form.$('.o_list_view tbody td:first()').click(); - assert.ok(!$('.modal').length, + assert.ok(!$('[role="dialog"]').length, 'in edit, clicking on a subrecord should not open a dialog'); assert.ok(form.$('.o_list_view tbody tr:first()').hasClass('o_selected_row'), 'first row should be in edition'); @@ -9776,12 +9776,12 @@ QUnit.module('relational_fields', { // add new subrecords form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_list_view').length, 1, + assert.strictEqual($('[role="dialog"] .o_list_view').length, 1, "a modal should be open"); - assert.strictEqual($('.modal .o_list_view .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_list_view .o_data_row').length, 1, "the list should contain one row"); - $('.modal .o_list_view .o_data_row').click(); // select a record - assert.strictEqual($('.modal .o_list_view').length, 0, + $('[role="dialog"] .o_list_view .o_data_row').click(); // select a record + assert.strictEqual($('[role="dialog"] .o_list_view').length, 0, "the modal should be closed"); assert.strictEqual(form.$('.o_list_view td.o_list_number').length, 3, 'should contain 3 subrecords'); @@ -10048,7 +10048,7 @@ QUnit.module('relational_fields', { }); form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_data_row:first').click(); // add a first record to the relation + $('[role="dialog"] .o_data_row:first').click(); // add a first record to the relation assert.strictEqual(form.$('.o_data_row').length, 1, "the record should have been added to the relation"); @@ -10056,7 +10056,7 @@ QUnit.module('relational_fields', { "inner m2m should have been fetched and correctly displayed"); form.$('.o_field_x2many_list_row_add a').click(); - $('.modal .o_data_row:first').click(); // add a second record to the relation + $('[role="dialog"] .o_data_row:first').click(); // add a second record to the relation assert.strictEqual(form.$('.o_data_row').length, 2, "the second record should have been added to the relation"); @@ -10109,13 +10109,13 @@ QUnit.module('relational_fields', { }); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .o_data_row').length, 1, + assert.strictEqual($('[role="dialog"] .o_data_row').length, 1, "should contain only one row (gold)"); - $('.modal .o_searchview_input').trigger({type: 'keypress', which: 115}); // s - $('.modal .o_searchview_input').trigger({type: 'keydown', which: 13}); // enter + $('[role="dialog"] .o_searchview_input').trigger({type: 'keypress', which: 115}); // s + $('[role="dialog"] .o_searchview_input').trigger({type: 'keydown', which: 13}); // enter - assert.strictEqual($('.modal .o_data_row').length, 0, "should contain no row"); + assert.strictEqual($('[role="dialog"] .o_data_row').length, 0, "should contain no row"); form.destroy(); }); @@ -10149,8 +10149,8 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('td.o_data_cell:first').click(); - $('.modal-body input[type="checkbox"]').click(); - $('.modal .modal-footer .btn-primary').first().click(); + $('main.modal-body input[type="checkbox"]').click(); + $('footer.modal-footer .btn-primary').first().click(); // there is nothing left to save -> should not do a 'write' RPC form.$buttons.find('.o_form_button_save').click(); @@ -10806,9 +10806,9 @@ QUnit.module('relational_fields', { assert.strictEqual($input.autocomplete('widget').find('li').length, 3, "autocomplete dropdown should have 3 entries (2 values + 'Search and Edit...')"); $input.autocomplete('widget').find('li:first()').click(); // adds a tag - assert.strictEqual(form.$('.o_field_many2manytags[name="timmy"] > span').length, 1, + assert.strictEqual(form.$('.o_field_many2manytags[name="timmy"] > button').length, 1, "should contain 1 tag"); - assert.ok(form.$('.o_field_many2manytags[name="timmy"] > span:contains("gold")').length, + assert.ok(form.$('.o_field_many2manytags[name="timmy"] > button:contains("gold")').length, "should contain newly added tag 'gold'"); form.destroy(); @@ -10841,18 +10841,18 @@ QUnit.module('relational_fields', { return this._super.apply(this, arguments); }, }); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 2, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 2, "should contain 2 tags"); - assert.ok(form.$('span:contains(gold)').length, + assert.ok(form.$('button:contains(gold)').length, 'should have fetched and rendered gold partner tag'); - assert.ok(form.$('span:contains(silver)').length, + assert.ok(form.$('button:contains(silver)').length, 'should have fetched and rendered silver partner tag'); - assert.strictEqual(form.$('span:first()').data('color'), 2, + assert.strictEqual(form.$('button:first()').data('color'), 2, 'should have correctly fetched the color'); form.$buttons.find('.o_form_button_edit').click(); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 2, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 2, "should still contain 2 tags in edit mode"); assert.ok(form.$('.o_tag_color_2 .o_badge_text:contains(gold)').length, 'first tag should still contain "gold" and be color 2 in edit mode'); @@ -10867,46 +10867,46 @@ QUnit.module('relational_fields', { assert.strictEqual($input.autocomplete('widget').find('li a:contains("red")').length, 1, "autocomplete dropdown should contain 'red'"); $input.autocomplete('widget').find('li').click(); // add 'red' - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 3, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 3, "should contain 3 tags"); - assert.ok(form.$('.o_field_many2manytags > span:contains("red")').length, + assert.ok(form.$('.o_field_many2manytags > button:contains("red")').length, "should contain newly added tag 'red'"); - assert.ok(form.$('.o_field_many2manytags > span[data-color=8]:contains("red")').length, + assert.ok(form.$('.o_field_many2manytags > button[data-color=8]:contains("red")').length, "should have fetched the color of added tag"); // remove tag with id 14 - form.$('.o_field_many2manytags span[data-id=14] .o_delete').click(); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 2, + form.$('.o_field_many2manytags button[data-id=14] .o_delete').click(); + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 2, "should contain 2 tags"); - assert.ok(!form.$('.o_field_many2manytags > span:contains("silver")').length, + assert.ok(!form.$('.o_field_many2manytags > button:contains("silver")').length, "should not contain tag 'silver' anymore"); // save the record (should do the write RPC with the correct commands) form.$buttons.find('.o_form_button_save').click(); // checkbox 'Hide in Kanban' - $input = form.$('.o_field_many2manytags span[data-id=13]'); // selects 'red' tag + $input = form.$('.o_field_many2manytags button[data-id=13]'); // selects 'red' tag $input.click(); // opens the colorpicker dropdown - assert.ok(form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox'), "should have a checkbox in the colorpicker dropdown menu"); + assert.ok(form.$('.o_field_many2manytags button[data-id=13] .o_colorpicker .o_checkbox'), "should have a checkbox in the colorpicker dropdown menu"); $input.click(); - var $checkBox = form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox input'); + var $checkBox = form.$('.o_field_many2manytags button[data-id=13] .o_colorpicker .o_checkbox input'); assert.notOk($checkBox.is(':checked'), "should have unticked checkbox in colorpicker dropdown menu"); $checkBox.mousedown(); - $input = form.$('.o_field_many2manytags span[data-id=13]'); // refresh + $input = form.$('.o_field_many2manytags button[data-id=13]'); // refresh assert.equal($input.data('color'), "0", "should become transparent when toggling on checkbox"); $input.click(); - $checkBox = form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox input'); // refresh + $checkBox = form.$('.o_field_many2manytags button[data-id=13] .o_colorpicker .o_checkbox input'); // refresh assert.ok($checkBox.is(':checked'), "should have a ticked checkbox in colorpicker dropdown menu after mousedown"); $checkBox.mousedown(); - $input = form.$('.o_field_many2manytags span[data-id=13]'); // refresh + $input = form.$('.o_field_many2manytags button[data-id=13]'); // refresh assert.equal($input.data('color'), "8", "should revert to old color when toggling off checkbox"); $input.click(); - $checkBox = form.$('.o_field_many2manytags span[data-id=13] .o_colorpicker .o_checkbox input'); // refresh + $checkBox = form.$('.o_field_many2manytags button[data-id=13] .o_colorpicker .o_checkbox input'); // refresh assert.notOk($checkBox.is(':checked'), "should have an unticked checkbox in colorpicker dropdown menu after 2nd click"); // TODO: it would be nice to test the behaviors of the autocomplete dropdown @@ -10939,9 +10939,9 @@ QUnit.module('relational_fields', { return this._super.apply(this, arguments); } }); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 1, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 1, "should contain 1 tag"); - assert.ok(form.$('span:contains(gold)').length, + assert.ok(form.$('button:contains(gold)').length, 'should have fetched and rendered gold partner tag'); form.$buttons.find('.o_form_button_edit').click(); @@ -10954,9 +10954,9 @@ QUnit.module('relational_fields', { assert.strictEqual($input.autocomplete('widget').find('li a:contains("silver")').length, 1, "autocomplete dropdown should contain 'silver'"); $input.autocomplete('widget').find('li').click(); // add 'silver' - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 2, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 2, "should contain 2 tags"); - assert.ok(form.$('.o_field_many2manytags > span:contains("silver")').length, + assert.ok(form.$('.o_field_many2manytags > button:contains("silver")').length, "should contain newly added tag 'silver'"); form.destroy(); @@ -10989,9 +10989,9 @@ QUnit.module('relational_fields', { assert.strictEqual($input.autocomplete('widget').find('li').length, 3, "autocomplete dropdown should have 3 entries (2 values + 'Search and Edit...')"); $input.autocomplete('widget').find('li:first()').click(); // adds a tag - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 1, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 1, "should contain 1 tag"); - assert.ok(form.$('.o_field_many2manytags > span:contains("gold")').length, + assert.ok(form.$('.o_field_many2manytags > button:contains("gold")').length, "should contain newly added tag 'gold'"); // save the record (should do the write RPC with the correct commands) @@ -11016,20 +11016,20 @@ QUnit.module('relational_fields', { }); // First checks that default color 0 is rendered as 0 color - assert.ok(form.$('span:first()').is('.o_tag_color_0'), + assert.ok(form.$('button:first()').is('.o_tag_color_0'), 'first tag color should be 0'); // Update the color in readonly - form.$('span:first()').click(); + form.$('button:first()').click(); $('.o_colorpicker a[data-color="1"]').trigger('mousedown'); // choose color 1 - assert.strictEqual(form.$('span:first()').data('color'), 1, + assert.strictEqual(form.$('button:first()').data('color'), 1, 'should have correctly updated the color (in readonly)'); // Update the color in edit form.$buttons.find('.o_form_button_edit').click(); - form.$('span:first()').click(); + form.$('button:first()').click(); $('.o_colorpicker a[data-color="6"]').trigger('mousedown'); // choose color 6 - assert.strictEqual(form.$('span:first()').data('color'), 6, + assert.strictEqual(form.$('button:first()').data('color'), 6, 'should have correctly updated the color (in edit)'); form.destroy(); }); @@ -11136,14 +11136,14 @@ QUnit.module('relational_fields', { form.$('.o_field_many2one input').click(); $dropdown.find('.o_m2o_dropdown_option:contains(Search)').mouseenter().click(); // Open Search More - $('.modal .o_search_options .fa-bars').click(); - $('.modal .o_search_options .o_group_by_menu a:contains(Bar)').click(); // group by 'Bar' + $('[role="dialog"] .o_search_options .fa-bars').click(); + $('[role="dialog"] .o_search_options .o_group_by_menu a:contains(Bar)').click(); // group by 'Bar' - $('.modal .o_group_header:first').click(); - assert.strictEqual($('.modal tbody:nth(1) .o_data_row').length, 7, + $('[role="dialog"] .o_group_header:first').click(); + assert.strictEqual($('[role="dialog"] tbody:nth(1) .o_data_row').length, 7, "should display 7 records in the first page"); - $('.modal .o_group_header:first .o_pager_next').click(); - assert.strictEqual($('.modal tbody:nth(1) .o_data_row').length, 1, + $('[role="dialog"] .o_group_header:first .o_pager_next').click(); + assert.strictEqual($('[role="dialog"] tbody:nth(1) .o_data_row').length, 1, "should display 1 record in the second page"); form.destroy(); @@ -11167,7 +11167,7 @@ QUnit.module('relational_fields', { '</form>', res_id: 1, }); - assert.strictEqual(form.$('.o_field_widget[name="partner_ids"] > span').length, 100, + assert.strictEqual(form.$('.o_field_widget[name="partner_ids"] > button').length, 100, 'should have rendered 100 tags'); form.destroy(); }); @@ -11192,14 +11192,14 @@ QUnit.module('relational_fields', { }); form.$buttons.find('.o_form_button_edit').click(); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 1, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 1, "should contain one tag"); // update foo, which will trigger an onchange and update timmy // -> m2mtags input should not have taken the focus form.$('input:first').focus(); form.$('input:first').val('trigger onchange').trigger('input'); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 0, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 0, "should contain no tags"); assert.strictEqual(form.$('input:first').get(0), document.activeElement, "foo input should have kept the focus"); @@ -11207,14 +11207,14 @@ QUnit.module('relational_fields', { // add a tag -> m2mtags input should still have the focus form.$('.o_field_many2manytags input').click(); // opens the dropdown form.$('.o_field_many2manytags input').autocomplete('widget').find('li:first').click(); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 1, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 1, "should contain a tag"); assert.strictEqual(form.$('.o_field_many2manytags input').get(0), document.activeElement, "m2m tags input should have kept the focus"); // remove a tag -> m2mtags input should still have the focus form.$('.o_field_many2manytags .o_delete').click(); - assert.strictEqual(form.$('.o_field_many2manytags > span').length, 0, + assert.strictEqual(form.$('.o_field_many2manytags > button').length, 0, "should contain no tags"); assert.strictEqual(form.$('.o_field_many2manytags input').get(0), document.activeElement, "m2m tags input should have kept the focus"); @@ -11700,8 +11700,8 @@ QUnit.module('relational_fields', { form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - var $dropdown = $('.modal .o_field_many2one input').autocomplete('widget'); - $('.modal input').val('new record').trigger('keydown'); + var $dropdown = $('[role="dialog"] .o_field_many2one input').autocomplete('widget'); + $('[role="dialog"] input').val('new record').trigger('keydown'); concurrency.delay(0).then(function () { $dropdown.find('li:first()').click(); // quick create 'new record' assert.verifySteps(['name_create']); @@ -11747,7 +11747,7 @@ QUnit.module('relational_fields', { $cell_o2m.click(); // In modal - var $modal = $('.modal-dialog.modal-lg'); + var $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'there should be one modal opened'); @@ -11793,7 +11793,7 @@ QUnit.module('relational_fields', { form.$('.o_data_cell').click(); // In modal - var $modal = $('.modal-dialog.modal-lg'); + var $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'there should be one modal opened'); @@ -11881,9 +11881,9 @@ QUnit.module('relational_fields', { form.$('.o_external_button').click(); // click on the external button (should do an RPC) - assert.strictEqual($('.modal .modal-title').text().trim(), 'Open: custom label', + assert.strictEqual($('[role="dialog"] .modal-title').text().trim(), 'Open: custom label', "dialog title should display the custom string label"); - $('.modal .o_form_button_cancel').click(); + $('[role="dialog"] .o_form_button_cancel').click(); form.$('.o_field_widget select').val('partner_type').trigger('change'); assert.strictEqual(form.$('.o_field_widget input').val(), "", @@ -12096,7 +12096,7 @@ QUnit.module('relational_fields', { // Add a record in the list x2mList.find('.o_field_x2many_list_row_add a').click(); - var modal = $('.modal-dialog.modal-lg'); + var modal = $('.modal-lg'); var nameInput = modal.find('input.o_input[name=display_name]'); nameInput.val('michelangelo').trigger('input'); diff --git a/addons/web/static/tests/fields/upgrade_fields_tests.js b/addons/web/static/tests/fields/upgrade_fields_tests.js index 427ec7b54e3..14f20bba8ad 100644 --- a/addons/web/static/tests/fields/upgrade_fields_tests.js +++ b/addons/web/static/tests/fields/upgrade_fields_tests.js @@ -33,7 +33,7 @@ QUnit.module('upgrade_fields', { }); form.$('input:checkbox').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "the 'Upgrade to Enterprise' dialog should be opened"); form.destroy(); diff --git a/addons/web/static/tests/services/notification_service_tests.js b/addons/web/static/tests/services/notification_service_tests.js index 68227093cea..feb3a600550 100644 --- a/addons/web/static/tests/services/notification_service_tests.js +++ b/addons/web/static/tests/services/notification_service_tests.js @@ -45,7 +45,7 @@ QUnit.module('Services', { }); var $notification = $('body .o_notification_manager .o_notification'); assert.strictEqual(_.str.trim($notification.html().replace(/\s+/g, ' ')), - "<div class=\"o_notification_title\"> <span class=\"o_icon fa fa-3x fa-lightbulb-o\"></span> a </div> <div class=\"o_notification_content\">b</div>", + "<div class=\"o_notification_title\"> <span role=\"img\" aria-label=\"Notification undefined\" class=\"o_icon fa fa-3x fa-lightbulb-o\" title=\"Notification undefined\"></span> a </div> <div class=\"o_notification_content\">b</div>", "should display notification"); assert.strictEqual($notification.find('.o_close').length, 0, "should not display the close button in "); setTimeout(function () { @@ -68,7 +68,7 @@ QUnit.module('Services', { }); var $notification = $('body .o_notification_manager .o_notification'); assert.strictEqual(_.str.trim($notification.html().replace(/\s+/g, ' ')), - "<div class=\"o_notification_title\"> <span class=\"o_icon fa fa-3x fa-exclamation\"></span> a </div> <div class=\"o_notification_content\">b</div>", + "<div class=\"o_notification_title\"> <span role=\"img\" aria-label=\"Notification undefined\" class=\"o_icon fa fa-3x fa-exclamation\" title=\"Notification undefined\"></span> a </div> <div class=\"o_notification_content\">b</div>", "should display notification"); view.destroy(); setTimeout(done); @@ -184,7 +184,7 @@ QUnit.module('Services', { var $notification = $('body .o_notification_manager .o_notification'); assert.strictEqual($notification.eq(0).find('.o_close').length, 1, "should display the close button in notification"); assert.strictEqual(_.str.trim($notification.eq(0).html().replace(/\s+/g, ' ')), - "<a class=\"fa fa-times o_close\" href=\"#\"></a> <div class=\"o_notification_title\"> <span class=\"o_icon fa fa-3x fa-question-circle-o\"></span> a0 </div> <div class=\"o_notification_content\">b0</div> <div class=\"o_buttons\"> <button type=\"button\" class=\"btn btn-sm btn-primary\"> <span>accept0</span> </button><button type=\"button\" class=\"btn btn-sm btn-default\"> <span>refuse0</span> </button> </div>", + "<a aria-label=\"Close\" class=\"fa fa-times o_close\" href=\"#\" title=\"Close\"></a> <div class=\"o_notification_title\"> <span role=\"img\" aria-label=\"Notification undefined\" class=\"o_icon fa fa-3x fa-question-circle-o\" title=\"Notification undefined\"></span> a0 </div> <div class=\"o_notification_content\">b0</div> <div class=\"o_buttons\"> <button type=\"button\" class=\"btn btn-sm btn-primary\"> <span>accept0</span> </button><button type=\"button\" class=\"btn btn-sm btn-default\"> <span>refuse0</span> </button> </div>", "should display notification"); $notification.find('.o_buttons button:contains(accept0)').click(); diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js index 0a7ca319c2f..5a07924413e 100644 --- a/addons/web/static/tests/views/calendar_tests.js +++ b/addons/web/static/tests/views/calendar_tests.js @@ -213,8 +213,8 @@ QUnit.module('Views', { $sidebar.find('input[type="text"]').trigger('click'); assert.strictEqual($('ul.ui-autocomplete li:not(.o_m2o_dropdown_option)').text(), "partner 4", "should display the last choice in one2many autocomplete"); // TODO: remove :not(.o_m2o_dropdown_option) because can't have "create & edit" choice $sidebar.find('.o_calendar_filter_item .o_remove').first().trigger('click'); - assert.ok($('.modal button.btn:contains(Ok)').length, "should display the confirm message"); - $('.modal button.btn:contains(Ok)').trigger('click'); + assert.ok($('footer.modal-footer button.btn:contains(Ok)').length, "should display the confirm message"); + $('footer.modal-footer button.btn:contains(Ok)').trigger('click'); assert.strictEqual($sidebar.find('.o_calendar_filter:has(h3:contains(attendees)) .o_calendar_filter_item').length, 3, "click on remove then should display 3 filter items for 'attendees'"); calendar.destroy(); }); @@ -295,19 +295,19 @@ QUnit.module('Views', { calendar.$('.fc-event:contains(event 4) .fc-content').trigger('click'); - assert.ok($('.modal-body').length, "should open the form view in dialog when click on event"); - assert.ok($('.modal button.btn:contains(Edit)').length, "formViewDialog should be in readonly mode"); - assert.ok($('.modal button.btn:contains(Delete)').length, "formViewDialog should have a delete button"); + assert.ok($('main.modal-body').length, "should open the form view in dialog when click on event"); + assert.ok($('footer.modal-footer button.btn:contains(Edit)').length, "formViewDialog should be in readonly mode"); + assert.ok($('footer.modal-footer button.btn:contains(Delete)').length, "formViewDialog should have a delete button"); - $('.modal button.btn:contains(Edit)').trigger('click'); + $('footer.modal-footer button.btn:contains(Edit)').trigger('click'); - assert.ok($('.modal-body').length, "should switch the modal in edit mode"); - assert.notOk($('.modal button.btn:contains(Delete)').length, "formViewDialog should not have a delete button in edit mode"); + assert.ok($('main.modal-body').length, "should switch the modal in edit mode"); + assert.notOk($('footer.modal-footer button.btn:contains(Delete)').length, "formViewDialog should not have a delete button in edit mode"); - $('.modal-body input:first').val('event 4 modified').trigger('input'); - $('.modal button.btn:contains(Save)').trigger('click'); + $('main.modal-body input:first').val('event 4 modified').trigger('input'); + $('footer.modal-footer button.btn:contains(Save)').trigger('click'); - assert.notOk($('.modal-body').length, "save button should close the modal"); + assert.notOk($('main.modal-body').length, "save button should close the modal"); assert.ok(calendar.$('.fc-event:contains(event 4 modified)').length, "should display the updated records"); // create a new event, quick create only @@ -317,12 +317,12 @@ QUnit.module('Views', { testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - assert.ok($('.modal-dialog.modal-sm').length, "should open the quick create dialog"); + assert.ok($('.modal-sm').length, "should open the quick create dialog"); - $('.modal-body input:first').val('new event in quick create').trigger('input'); - $('.modal button.btn:contains(Create)').trigger('click').trigger('click'); + $('main.modal-body input:first').val('new event in quick create').trigger('input'); + $('footer.modal-footer button.btn:contains(Create)').trigger('click').trigger('click'); - assert.strictEqual(calendar.$('.fc-event:contains(new event in quick create)').length, 1, "should display the new record"); + assert.strictEqual(calendar.$('.fc-event:contains(new event in quick create)').length, 1, "should display the new record after quick create"); assert.strictEqual(calendar.$('td.fc-event-container[colspan]').length, 2, "should the new record have only one day"); // create a new event, quick create only (validated by pressing enter key) @@ -330,9 +330,9 @@ QUnit.module('Views', { testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - assert.ok($('.modal-dialog.modal-sm').length, "should open the quick create dialog"); + assert.ok($('.modal-sm').length, "should open the quick create dialog"); - $('.modal-body input:first') + $('main.modal-body input:first') .val('new event in quick create validated by pressing enter key.') .trigger($.Event('keyup', {keyCode: $.ui.keyCode.ENTER})) .trigger($.Event('keyup', {keyCode: $.ui.keyCode.ENTER})); @@ -347,20 +347,20 @@ QUnit.module('Views', { testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - assert.strictEqual($('.modal-dialog.modal-sm').length, 1, "should open the quick create dialog"); + assert.strictEqual($('.modal-sm').length, 1, "should open the quick create dialog"); - $('.modal-body input:first').val('coucou').trigger('input'); - $('.modal button.btn:contains(Edit)').trigger('click'); + $('main.modal-body input:first').val('coucou').trigger('input'); + $('footer.modal-footer button.btn:contains(Edit)').trigger('click'); - assert.strictEqual($('.modal-dialog.modal-lg .o_form_view').length, 1, "should open the slow create dialog"); - assert.strictEqual($('.modal-dialog.modal-lg .modal-title').text(), "Create: Events", + assert.strictEqual($('.modal-lg .o_form_view').length, 1, "should open the slow create dialog"); + assert.strictEqual($('.modal-lg .modal-title').text(), "Create: Events", "should use the string attribute as modal title"); - assert.strictEqual($('.modal-dialog.modal-lg .o_form_view input[name="name"]').val(), "coucou", + assert.strictEqual($('.modal-lg .o_form_view input[name="name"]').val(), "coucou", "should have set the name from the quick create dialog"); $('.modal-lg button.btn:contains(Save)').trigger('click'); - assert.strictEqual(calendar.$('.fc-event:contains(coucou)').length, 1, "should display the new record"); + assert.strictEqual(calendar.$('.fc-event:contains(coucou)').length, 1, "should display the new record with string attribute"); // create a new event with 2 days @@ -370,14 +370,14 @@ QUnit.module('Views', { testUtils.triggerMouseEvent($cell.next(), "mousemove"); testUtils.triggerMouseEvent($cell.next(), "mouseup"); - $('.modal input:first').val('new event in quick create 2').trigger('input'); - $('.modal button.btn:contains(Edit)').trigger('click'); + $('.modal-dialog input:first').val('new event in quick create 2').trigger('input'); + $('footer.modal-footer button.btn:contains(Edit)').trigger('click'); assert.strictEqual($('.modal-lg input:first').val(), 'new event in quick create 2', "should open the formViewDialog with default values"); $('.modal-lg button.btn:contains(Save)').trigger('click'); - assert.notOk($('.modal').length, "should close dialogs"); + assert.notOk($('[role="dialog"]').length, "should close dialogs"); var $newevent2 = calendar.$('.fc-event:contains(new event in quick create 2)'); assert.ok($newevent2.length, "should display the 2 days new record"); assert.strictEqual($newevent2.closest('.fc-event-container').attr('colspan'), "2", "the new record should have 2 days"); @@ -385,9 +385,9 @@ QUnit.module('Views', { // delete the a record calendar.$('.fc-event:contains(event 4) .fc-content').trigger('click'); - $('.modal button.btn:contains(Delete)').trigger('click'); - assert.ok($('.modal button.btn:contains(Ok)').length, "should display the confirm message"); - $('.modal button.btn:contains(Ok)').trigger('click'); + $('footer.modal-footer button.btn:contains(Delete)').trigger('click'); + assert.ok($('footer.modal-footer button.btn:contains(Ok)').length, "should display the confirm message"); + $('footer.modal-footer button.btn:contains(Ok)').trigger('click'); assert.notOk(calendar.$('.fc-event:contains(event 4) .fc-content').length, "the record should be deleted"); assert.strictEqual(calendar.$('.fc-event-container .fc-event').length, 10, "should display 10 events"); @@ -439,18 +439,18 @@ QUnit.module('Views', { testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - assert.strictEqual($('.modal-dialog.modal-sm .modal-title').text(), 'Create: Events', + assert.strictEqual($('.modal-sm .modal-title').text(), 'Create: Events', "should open the quick create dialog"); - $('.modal-body input:first').val('new event in quick create').trigger('input'); - $('.modal button.btn:contains(Create)').trigger('click').trigger('click'); + $('main.modal-body input:first').val('new event in quick create').trigger('input'); + $('footer.modal-footer button.btn:contains(Create)').trigger('click').trigger('click'); // If the event is not default-prevented, a traceback will be raised, which we do not want assert.ok(event.isDefaultPrevented(), "fail deferred event should have been default-prevented"); - assert.strictEqual($('.modal-dialog.modal-lg .modal-title').text(), 'Create: Events', + assert.strictEqual($('.modal-lg .modal-title').text(), 'Create: Events', "should have switched to a bigger modal for an actual create rather than quickcreate"); - assert.strictEqual($('.modal-dialog.modal-lg .modal-body .o_form_view.o_form_editable').length, 1, + assert.strictEqual($('.modal-lg main .o_form_view.o_form_editable').length, 1, "should open the full event form view in a dialog"); calendar.destroy(); @@ -1328,7 +1328,7 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(4) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - $('.modal-body input:first').val('coucou').trigger('input'); + $('main.modal-body input:first').val('coucou').trigger('input'); testUtils.intercept(calendar, 'do_action', function (event) { assert.deepEqual(event.data.action, @@ -1385,7 +1385,7 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(4) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - $('.modal-body input:first').val('coucou').trigger('input'); + $('main.modal-body input:first').val('coucou').trigger('input'); testUtils.intercept(calendar, 'do_action', function (event) { assert.deepEqual(event.data.action, @@ -1463,7 +1463,7 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(4) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - $('.modal-body input:first').val('coucou').trigger('input'); + $('main.modal-body input:first').val('coucou').trigger('input'); testUtils.intercept(calendar, 'do_action', function (event) { assert.deepEqual(event.data.action, @@ -1600,8 +1600,8 @@ QUnit.module('Views', { testUtils.triggerPositionalMouseEvent(left, top + 200, "mousemove"); testUtils.triggerPositionalMouseEvent(left, top + 200, "mouseup"); - $('.modal-body input:first').val('coucou').trigger('input'); - $('.modal button.btn:contains(Create)').trigger('click'); + $('main.modal-body input:first').val('coucou').trigger('input'); + $('footer.modal-footer button.btn:contains(Create)').trigger('click'); assert.strictEqual(calendar.$('.o_calendar_filter_item').length, 6, "should add the missing filter (active)"); assert.strictEqual(calendar.$('.fc-event').length, 4, "should display the created item"); @@ -1617,8 +1617,8 @@ QUnit.module('Views', { testUtils.triggerPositionalMouseEvent(left, top + 200, "mousemove"); testUtils.triggerPositionalMouseEvent(left, top + 200, "mouseup"); - $('.modal-body input:first').val('coucou 2').trigger('input'); - $('.modal button.btn:contains(Create)').trigger('click'); + $('main.modal-body input:first').val('coucou 2').trigger('input'); + $('footer.modal-footer button.btn:contains(Create)').trigger('click'); assert.strictEqual(calendar.$('.o_calendar_filter_item').length, 6, "should have the same filters"); assert.strictEqual(calendar.$('.fc-event').length, 4, "should not display the created item"); @@ -1697,10 +1697,10 @@ QUnit.module('Views', { testUtils.triggerPositionalMouseEvent(left, top + 200, "mousemove"); testUtils.triggerPositionalMouseEvent(left, top + 200, "mouseup"); - $('.modal-body input:first').val('coucou').trigger('input'); + $('main.modal-body input:first').val('coucou').trigger('input'); - $('.modal button.btn:contains(Edit)').trigger('click'); - $('.modal button.btn:contains(Save)').trigger('click'); + $('footer.modal-footer button.btn:contains(Edit)').trigger('click'); + $('footer.modal-footer button.btn:contains(Save)').trigger('click'); assert.strictEqual(calendar.$('.o_calendar_filter_item').length, 6, "should add the missing filter (active)"); assert.strictEqual(calendar.$('.fc-event').length, 4, "should display the created item"); @@ -1906,10 +1906,10 @@ QUnit.module('Views', { "should open the quick create dialog"); // Creating the event - $('.modal-body input:first').val('new event in quick create').trigger('input'); - $('.modal button.btn:contains(Create)').trigger('click').trigger('click'); + $('main.modal-body input:first').val('new event in quick create').trigger('input'); + $('footer.modal-footer button.btn:contains(Create)').trigger('click').trigger('click'); assert.strictEqual(calendar.$('.fc-event:contains(new event in quick create)').length, 1, - "should display the new record"); + "should display the new record after quick create dialog"); calendar.destroy(); $view.remove(); @@ -1989,14 +1989,14 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - var $input = $('.modal-body input:first'); + var $input = $('[role="dialog"] input:first'); $input.val('new event in quick create').trigger('input'); // Simulate ENTER pressed on Create button (after a TAB) $input.trigger($.Event('keyup', { which: $.ui.keyCode.ENTER, keyCode: $.ui.keyCode.ENTER, })); - $('.modal-footer button:first').click(); + $('footer.modal-footer button:first').click(); def.resolve(); assert.strictEqual(createCount, 1, "should create only one event"); @@ -2221,7 +2221,7 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - var $input = $('.modal-body input:first'); + var $input = $('main.modal-body input:first'); $input.val("It's just a fleshwound").trigger('input'); $('.modal button.btn:contains(Create)').trigger('click'); @@ -2268,7 +2268,7 @@ QUnit.module('Views', { var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)'); testUtils.triggerMouseEvent($cell, "mousedown"); testUtils.triggerMouseEvent($cell, "mouseup"); - var $input = $('.modal-body input:first'); + var $input = $('main.modal-body input:first'); $input.val("It's just a fleshwound").trigger('input'); $('.modal button.btn:contains(Create)').trigger('click'); diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index 18c82adb0a5..44ac724995b 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -2131,13 +2131,13 @@ QUnit.module('Views', { "should display the name of the many2many on the original form"); form.$('td:contains(gold)').click(); - assert.strictEqual($('.modal-dialog').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, 'The partner_type modal should have opened'); - assert.strictEqual($('.modal-dialog').find('td:contains(first record)').length, 1, + assert.strictEqual($('[role="dialog"]').find('td:contains(first record)').length, 1, "should display the name of the many2many on the modal form"); - $('.modal-dialog').find('td:contains(first record)').click(); - assert.strictEqual($('.modal-dialog').length, 2, + $('[role="dialog"]').find('td:contains(first record)').click(); + assert.strictEqual($('[role="dialog"]').length, 2, 'There should be 2 modals (partner on top of partner_type) opened'); form.destroy(); @@ -2167,7 +2167,7 @@ QUnit.module('Views', { // click on discard form.$buttons.find('.o_form_button_cancel').click(); - assert.ok(!$('.modal:visible').length, 'no confirm modal should be displayed'); + assert.ok(!$('[role="dialog"]:visible').length, 'no confirm modal should be displayed'); assert.strictEqual(form.$('.o_field_widget').text(), 'yop', 'field in readonly should display yop'); assert.strictEqual(nbWrite, 0, 'no write RPC should have been done'); @@ -2200,14 +2200,14 @@ QUnit.module('Views', { // click on discard and cancel the confirm request form.$buttons.find('.o_form_button_cancel').click(); - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-default').click(); // click on cancel + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-default').click(); // click on cancel assert.strictEqual(form.$('input').val(), 'new value', 'input should still contain new value'); // click on discard and confirm form.$buttons.find('.o_form_button_cancel').click(); - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(form.$('.o_field_widget').text(), 'yop', 'field in readonly should display yop'); assert.strictEqual(nbWrite, 0, 'no write RPC should have been done'); @@ -2287,7 +2287,7 @@ QUnit.module('Views', { // click on discard and confirm form.$buttons.find('.o_form_button_cancel').click(); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.notOk(form.$el.prop('outerHTML').match('xphone'), "the string xphone should not be present after discarding"); @@ -2317,7 +2317,7 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_cancel').click(); - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, 'there should not be a confirm modal'); form.destroy(); @@ -2351,17 +2351,17 @@ QUnit.module('Views', { // discard the changes and check it has properly been discarded form.$buttons.find('.o_form_button_cancel').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, 'there should be a confirm modal'); assert.strictEqual(form.$('input').val(), 'DEF', 'input should be DEF'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(form.$('input').val(), 'ABC', 'input should now be ABC'); // redirty and discard the field foo (to make sure initial changes haven't been lost) form.$('input').val('GHI').trigger('input'); form.$buttons.find('.o_form_button_cancel').click(); assert.strictEqual(form.$('input').val(), 'GHI', 'input should be GHI'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(form.$('input').val(), 'ABC', 'input should now be ABC'); form.destroy(); @@ -2395,7 +2395,7 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_cancel').click(); - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, 'there should not be a confirm modal'); form.destroy(); @@ -2436,15 +2436,15 @@ QUnit.module('Views', { // click on the pager to switch to the next record and cancel the confirm request form.pager.$('.o_pager_next').click(); // click on next - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-default').click(); // click on cancel + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-default').click(); // click on cancel assert.strictEqual(form.$('input').val(), 'new value', 'input should still contain new value'); assert.strictEqual(form.pager.$('.o_pager_value').text(), "1", 'pager value should still be 1'); // click on the pager to switch to the next record and confirm form.pager.$('.o_pager_next').click(); // click on next - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(form.$('input').val(), 'blip', 'input should contain blip'); assert.strictEqual(form.pager.$('.o_pager_value').text(), "2", 'pager value should be 2'); @@ -2483,7 +2483,7 @@ QUnit.module('Views', { // click on the pager to switch to the next record and cancel the confirm request form.pager.$('.o_pager_next').click(); // click on next - assert.strictEqual($('.modal:visible').length, 0, 'no confirm modal should be displayed'); + assert.strictEqual($('[role="dialog"]:visible').length, 0, 'no confirm modal should be displayed'); assert.strictEqual(form.pager.$('.o_pager_value').text(), "2", 'pager value should be 2'); assert.strictEqual(form.$('.o_priority .fa-star-o').length, 2, @@ -2495,7 +2495,7 @@ QUnit.module('Views', { 'priority widget should have been updated'); form.pager.$('.o_pager_next').click(); // click on next - assert.strictEqual($('.modal:visible').length, 0, 'no confirm modal should be displayed'); + assert.strictEqual($('[role="dialog"]:visible').length, 0, 'no confirm modal should be displayed'); assert.strictEqual(form.pager.$('.o_pager_value').text(), "1", 'pager value should be 1'); // switch to edit mode @@ -2506,8 +2506,8 @@ QUnit.module('Views', { form.$('input').val('wrong value').trigger('input'); form.$buttons.find('.o_form_button_cancel').click(); - assert.strictEqual($('.modal').length, 1, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + assert.strictEqual($('[role="dialog"]').length, 1, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // click on confirm form.pager.$('.o_pager_next').click(); // click on next assert.strictEqual(form.pager.$('.o_pager_value').text(), "2", 'pager value should be 2'); form.destroy(); @@ -2736,16 +2736,16 @@ QUnit.module('Views', { assert.strictEqual(form.pager.$('.o_pager_limit').text(), "3", 'pager limit should be 3'); assert.strictEqual(form.$('span:contains(yop)').length, 1, 'should have a field with foo value for record 1'); - assert.ok(!$('.modal:visible').length, 'no confirm modal should be displayed'); + assert.ok(!$('[role="dialog"]:visible').length, 'no confirm modal should be displayed'); // open sidebar form.sidebar.$('button.o_dropdown_toggler_btn').click(); form.sidebar.$('a:contains(Delete)').click(); - assert.ok($('.modal').length, 'a confirm modal should be displayed'); + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); // confirm the delete - $('.modal .modal-footer button.btn-primary').click(); + $('footer.modal-footer button.btn-primary').click(); assert.strictEqual(form.pager.$('.o_pager_value').text(), "1", 'pager value should be 1'); assert.strictEqual(form.pager.$('.o_pager_limit').text(), "2", 'pager limit should be 2'); @@ -2784,9 +2784,9 @@ QUnit.module('Views', { testUtils.intercept(form, 'history_back', function () { assert.step('history_back'); }); - assert.strictEqual($('.modal').length, 1, 'a confirm modal should be displayed'); - $('.modal .modal-footer button.btn-primary').click(); - assert.strictEqual($('.modal').length, 0, 'no confirm modal should be displayed'); + assert.strictEqual($('[role="dialog"]').length, 1, 'a confirm modal should be displayed'); + $('footer.modal-footer button.btn-primary').click(); + assert.strictEqual($('[role="dialog"]').length, 0, 'no confirm modal should be displayed'); assert.verifySteps(['read', 'unlink', 'history_back']); form.destroy(); @@ -3354,7 +3354,7 @@ QUnit.module('Views', { // open a subrecord and trigger an onchange readInModal = true; form.$('.o_data_row .o_data_cell:first').click(); - $('.modal .o_field_widget[name=name]').val("new name").trigger('input'); + $('[role="dialog"] .o_field_widget[name=name]').val("new name").trigger('input'); form.destroy(); }); @@ -3582,7 +3582,7 @@ QUnit.module('Views', { // discard changes form.$buttons.find('.o_form_button_cancel').click(); - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); assert.strictEqual(form.$('span[name="foo"]').text(), "blip", "field foo should still be displayed to initial value"); @@ -3627,13 +3627,13 @@ QUnit.module('Views', { assert.strictEqual(form.$('.o_field_widget[name="foo"]').val(), "1234", "field foo should still contain new value"); - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, "Confirm dialog should not be displayed"); // complete the write def.resolve(); - assert.strictEqual($('.modal').length, 0, + assert.strictEqual($('[role="dialog"]').length, 0, "Confirm dialog should not be displayed"); assert.strictEqual(form.$('.o_field_widget[name="foo"]').text(), "1234", "value should have been saved and rerendered in readonly"); @@ -3804,9 +3804,9 @@ QUnit.module('Views', { "onchange should have been correctly applied on field in o2m list"); form.$('.o_data_row').click(); // edit the o2m in the dialog - assert.strictEqual($('.modal .modal-title').text().trim(), 'Open: one2many field', + assert.strictEqual($('[role="dialog"] .modal-title').text().trim(), 'Open: one2many field', "the field string is displayed in the modal title"); - assert.strictEqual($('.modal .o_field_widget').val(), 'foo changed', + assert.strictEqual($('[role="dialog"] .o_field_widget').val(), 'foo changed', "the onchange value hasn't been discarded when opening the o2m"); form.destroy(); @@ -3898,20 +3898,20 @@ QUnit.module('Views', { "the initial value should be the default one"); form.$('.o_data_row td:first').click(); // edit the o2m in a dialog - $('.modal input:nth(1)').val(77).trigger('input'); - assert.strictEqual($('.modal input:first').val(), '[blip] 77', + $('[role="dialog"] input:nth(1)').val(77).trigger('input'); + assert.strictEqual($('[role="dialog"] input:first').val(), '[blip] 77', "onchange should have been correctly applied"); - $('.modal .modal-footer .btn-primary').click(); // save the dialog + $('footer.modal-footer .btn-primary').click(); // save the dialog assert.strictEqual(form.$('.o_data_row td:first').text(), '[blip] 77', "onchange should have been correctly applied"); // create a new o2m record form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal .modal-title').text().trim(), 'Create custom label', + assert.strictEqual($('[role="dialog"] .modal-title').text().trim(), 'Create custom label', "the custom field label is applied in the modal title"); - assert.strictEqual($('.modal input:first').val(), '[blip] 14', + assert.strictEqual($('[role="dialog"] input:first').val(), '[blip] 14', "onchange should have been correctly applied after default get"); - $('.modal .modal-footer .btn-primary').click(); // save the dialog + $('footer.modal-footer .btn-primary').click(); // save the dialog assert.strictEqual(form.$('.o_data_row:nth(1) td:first').text(), '[blip] 14', "onchange should have been correctly applied after default get"); @@ -4340,10 +4340,10 @@ QUnit.module('Views', { // add a o2m subrecord form.$('.o_field_x2many_list_row_add a').click(); - $('.modal-body .o_field_one2many .o_field_x2many_list_row_add a').click(); - $('.modal-body input').val('xtv').trigger('input'); - $('.modal-footer button:first').click(); // save & close - assert.strictEqual($('.modal').length, 0, + $('main.modal-body .o_field_one2many .o_field_x2many_list_row_add a').click(); + $('main.modal-body input').val('xtv').trigger('input'); + $('footer.modal-footer button:first').click(); // save & close + assert.strictEqual($('[role="dialog"]').length, 0, "dialog should be closed"); var row = form.$('.o_field_one2many .o_list_view .o_data_row'); @@ -4639,7 +4639,7 @@ QUnit.module('Views', { assert.strictEqual(row.children()[1].textContent, '1 record', "the cell should contains the number of record: 1"); row.click(); - var modal_row = $('.modal-body .o_form_sheet .o_field_one2many .o_list_view .o_data_row'); + var modal_row = $('main.modal-body .o_form_sheet .o_field_one2many .o_list_view .o_data_row'); assert.strictEqual(modal_row.children().length, 2, "the row should contains the 2 fields defined in the form view"); assert.strictEqual($(modal_row).text(), "gold2", @@ -4986,29 +4986,29 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_edit').click(); // Open first dialog form.$('.o_external_button').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "One FormViewDialog should be opened"); - var $firstModal = $('.modal'); - assert.strictEqual($('.modal .modal-title').first().text().trim(), 'Open: Product', + var $firstModal = $('[role="dialog"]'); + assert.strictEqual($('[role="dialog"] .modal-title').first().text().trim(), 'Open: Product', "dialog title should display the python field string as label"); assert.strictEqual($firstModal.find('input').val(), 'xphone', "display_name should be correctly displayed"); // Open second dialog $firstModal.find('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 2, + assert.strictEqual($('[role="dialog"]').length, 2, "two FormViewDialogs should be opened"); - var $secondModal = $('.modal:nth(1)'); + var $secondModal = $('[role="dialog"]:nth(1)'); // Add new value $secondModal.find('input').val('xtv').trigger('input'); - $secondModal.find('.modal-footer button:first').click(); // Save & close - assert.strictEqual($('.modal').length, 1, + $secondModal.find('footer.modal-footer button:first').click(); // Save & close + assert.strictEqual($('[role="dialog"]').length, 1, "last opened dialog should be closed"); // Check that data in first dialog is correctly updated assert.strictEqual($firstModal.find('tr.o_data_row td').text(), 'xtv', "should have added a line with xtv as new record"); - $firstModal.find('.modal-footer button:first').click(); // Save & close + $firstModal.find('footer.modal-footer button:first').click(); // Save & close form.destroy(); }); @@ -5210,12 +5210,12 @@ QUnit.module('Views', { "record 1 should be first"); form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "FormViewDialog should be opened"); - $('.modal input[name="foo"]').val('xop').trigger("input"); - $('.modal .modal-footer button:eq(1)').click(); // Save & new - $('.modal input[name="foo"]').val('zop').trigger("input"); - $('.modal .modal-footer button:first').click(); // Save & close + $('[role="dialog"] input[name="foo"]').val('xop').trigger("input"); + $('footer.modal-footer button:eq(1)').click(); // Save & new + $('[role="dialog"] input[name="foo"]').val('zop').trigger("input"); + $('footer.modal-footer button:first').click(); // Save & close // client-side sort assert.ok(form.$('.o_field_one2many tbody tr:eq(0) td:contains(zop)').length, @@ -5237,8 +5237,8 @@ QUnit.module('Views', { // client-side sort on edit form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_one2many tbody tr:eq(1) td:contains(yop)').click(); - $('.modal input[name="foo"]').val('zzz').trigger("input"); - $('.modal .modal-footer button:first').click(); // Save + $('[role="dialog"] input[name="foo"]').val('zzz').trigger("input"); + $('footer.modal-footer button:first').click(); // Save assert.ok(form.$('.o_field_one2many tbody tr:eq(0) td:contains(zzz)').length, "record zzz should be first"); assert.ok(form.$('.o_field_one2many tbody tr:eq(1) td:contains(zop)').length, @@ -5524,7 +5524,7 @@ QUnit.module('Views', { }); form.$('.o_data_row:first').click(); - assert.strictEqual($('.modal .modal-title').first().text().trim(), 'Open: custom label', + assert.strictEqual($('[role="dialog"] .modal-title').first().text().trim(), 'Open: custom label', "modal should use the python field string as title"); form.destroy(); @@ -5610,10 +5610,10 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_edit').click(); form.$('[name="product_id"] .o_external_button').click(); - assert.strictEqual($('.modal-body .o_field_translate').length, 1, + assert.strictEqual($('main.modal-body .o_field_translate').length, 1, "there should be a translate button in the modal"); - $('.modal-body .o_field_translate').click(); + $('main.modal-body .o_field_translate').click(); assert.strictEqual(nbTranslateCalls, 1, "should call_button translate once"); @@ -5780,7 +5780,7 @@ QUnit.module('Views', { form.$('.o_statusbar_buttons button').click(); assert.ok(form.$('.o_statusbar_buttons button').prop('disabled'), 'button should be disabled'); - $('.modal .modal-footer button.btn-default').click(); + $('footer.modal-footer button.btn-default').click(); assert.ok(!form.$('.o_statusbar_buttons button').prop('disabled'), 'button should no longer be disabled'); @@ -5789,7 +5789,7 @@ QUnit.module('Views', { // click on button, and click on ok in confirm dialog form.$('.o_statusbar_buttons button').click(); assert.verifySteps(['default_get']); - $('.modal .modal-footer button.btn-primary').click(); + $('footer.modal-footer button.btn-primary').click(); assert.verifySteps(['default_get', 'create', 'read', 'execute_action']); @@ -5845,17 +5845,17 @@ QUnit.module('Views', { form.$('.o_external_button').click(); - assert.notOk($('.modal .oe_button_box button').attr('disabled'), + assert.notOk($('[role="dialog"] .oe_button_box button').attr('disabled'), "stat buttons should be enabled"); - $('.modal .oe_button_box button').click(); + $('[role="dialog"] .oe_button_box button').click(); - assert.ok($('.modal .oe_button_box button').attr('disabled'), + assert.ok($('[role="dialog"] .oe_button_box button').attr('disabled'), "stat buttons should be disabled"); def.resolve(); - assert.notOk($('.modal .oe_button_box button').attr('disabled'), + assert.notOk($('[role="dialog"] .oe_button_box button').attr('disabled'), "stat buttons should be enabled"); form.destroy(); @@ -6034,16 +6034,16 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_edit').click(); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "One FormViewDialog should be opened"); // set a value on the m2o var $dropdown = form.$('.o_field_many2one input').autocomplete('widget'); - $('.modal .o_field_many2one input').click(); + $('[role="dialog"] .o_field_many2one input').click(); $dropdown.find('li:first()').click(); - $('.modal .modal-footer button:eq(1)').click(); // Save & new - $('.modal .o_field_many2one input').click(); - $('.modal .modal-footer button:first').click(); // Save & close + $('footer.modal-footer button:eq(1)').click(); // Save & new + $('[role="dialog"] .o_field_many2one input').click(); + $('footer.modal-footer button:first').click(); // Save & close form.destroy(); }); @@ -6133,20 +6133,20 @@ QUnit.module('Views', { }); form.$('.o_field_x2many_list_row_add a').click(); - assert.strictEqual($('.modal input.o_field_widget[name=foo]').length, 1, + assert.strictEqual($('[role="dialog"] input.o_field_widget[name=foo]').length, 1, 'foo should be editable'); checkOnchange = true; - $('.modal .o_field_widget[name=foo]').val('foo value').trigger('input'); - $('.modal .o_field_widget[name=display_name]').val('readonly').trigger('input'); - assert.strictEqual($('.modal span.o_field_widget[name=foo]').length, 1, + $('[role="dialog"] .o_field_widget[name=foo]').val('foo value').trigger('input'); + $('[role="dialog"] .o_field_widget[name=display_name]').val('readonly').trigger('input'); + assert.strictEqual($('[role="dialog"] span.o_field_widget[name=foo]').length, 1, 'foo should be readonly'); - $('.modal .modal-footer .btn-primary').click(); // close the modal + $('footer.modal-footer .btn-primary').click(); // close the modal checkOnchange = false; form.$('.o_data_row').click(); // re-open previous record - assert.strictEqual($('.modal .o_field_widget[name=foo]').text(), 'foo value', + assert.strictEqual($('[role="dialog"] .o_field_widget[name=foo]').text(), 'foo value', "the edited value should have been kept"); - $('.modal .modal-footer .btn-primary').click(); // close the modal + $('footer.modal-footer .btn-primary').click(); // close the modal form.$buttons.find('.o_form_button_save').click(); // save the record @@ -6219,8 +6219,8 @@ QUnit.module('Views', { form.$buttons.find('.o_form_button_save').click(); // save duplicated record form.sidebar.$('a:contains(Delete)').click(); // delete duplicated record - assert.strictEqual($('.modal').length, 1, "should have opened a confirm dialog"); - $('.modal .modal-footer .btn-primary').click(); // confirm + assert.strictEqual($('[role="dialog"]').length, 1, "should have opened a confirm dialog"); + $('footer.modal-footer .btn-primary').click(); // confirm assert.strictEqual(form.$('.o_field_widget').text(), 'first record', "should have come back to previous record"); @@ -6301,12 +6301,12 @@ QUnit.module('Views', { }); form.$('.o_external_button').click(); // open the many2one record in a modal - $('.modal .o_external_button').click(); // in the modal, open the many2one record in another modal + $('[role="dialog"] .o_external_button').click(); // in the modal, open the many2one record in another modal - $('.modal:nth(1) .o_field_widget[name=display_name]').val('new name').trigger('input'); - $('.modal:nth(1) .modal-footer .btn-primary').first().click(); // save changes + $('[role="dialog"]:nth(1) .o_field_widget[name=display_name]').val('new name').trigger('input'); + $('[role="dialog"]:nth(1) footer .btn-primary').first().click(); // save changes - assert.strictEqual($('.modal .o_field_widget[name=trululu] input').val(), 'new name', + assert.strictEqual($('[role="dialog"] .o_field_widget[name=trululu] input').val(), 'new name', "record should have been reloaded"); assert.verifySteps([ "read", // main record @@ -6409,11 +6409,11 @@ QUnit.module('Views', { viewOptions: {mode: 'edit'}, }); form.$('.o_external_button').click(); - assert.strictEqual($('.modal-body .o_form_view .o_list_view .o_data_cell').text(), "yopblip", + assert.strictEqual($('main.modal-body .o_form_view .o_list_view .o_data_cell').text(), "yopblip", "table has some initial order"); - $('.modal-body .o_form_view .o_list_view th').click(); - assert.strictEqual($('.modal-body .o_form_view .o_list_view .o_data_cell').text(), "blipyop", + $('main.modal-body .o_form_view .o_list_view th').click(); + assert.strictEqual($('main.modal-body .o_form_view .o_list_view .o_data_cell').text(), "blipyop", "table is now sorted"); form.destroy(); }); @@ -6849,7 +6849,7 @@ QUnit.module('Views', { core.bus.on('clear_cache', form, assert.step.bind(assert, 'clear_cache')); form.sidebar.$('a:contains(Delete)').click(); - $('.modal .modal-footer .btn-primary').click(); // confirm + $('footer.modal-footer .btn-primary').click(); // confirm assert.verifySteps(['unlink', 'clear_cache']); diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js index 04c1c603118..2cc7a2431ef 100644 --- a/addons/web/static/tests/views/kanban_tests.js +++ b/addons/web/static/tests/views/kanban_tests.js @@ -182,12 +182,12 @@ QUnit.module('Views', { "last column should contain 3 records"); envIDs = [4]; kanban.$('.o_kanban_group:last .o_column_archive_records').click(); // Click on 'Archive All' - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-default').click(); // Click on 'Cancel' + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-default').click(); // Click on 'Cancel' assert.strictEqual(kanban.$('.o_kanban_group:last .o_kanban_record').length, 3, "still last column should contain 3 records"); kanban.$('.o_kanban_group:last .o_column_archive_records').click(); - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // Click on 'Ok' + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // Click on 'Ok' assert.strictEqual(kanban.$('.o_kanban_group:last .o_kanban_record').length, 0, "last column should not contain any records"); kanban.destroy(); }); @@ -1204,16 +1204,16 @@ QUnit.module('Views', { which: $.ui.keyCode.ENTER, })); - assert.strictEqual($('.modal .o_form_view.o_form_editable').length, 1, + assert.strictEqual($('[role="dialog"] .o_form_view.o_form_editable').length, 1, "a form view dialog should have been opened (in edit)"); - assert.strictEqual($('.modal .o_field_many2one input').val(), 'hello', + assert.strictEqual($('[role="dialog"] .o_field_many2one input').val(), 'hello', "the correct product_id should already be set"); // specify a name and save - $('.modal input[name=foo]').val('test').trigger('input'); - $('.modal-footer .btn-primary').click(); + $('[role="dialog"] input[name=foo]').val('test').trigger('input'); + $('footer.modal-footer .btn-primary').click(); - assert.strictEqual($('.modal').length, 0, "the modal should be closed"); + assert.strictEqual($('[role="dialog"]').length, 0, "the modal should be closed"); assert.strictEqual(kanban.$('.o_kanban_group:first .o_kanban_record').length, 3, "there should be 3 records in first column"); var $firstRecord = kanban.$('.o_kanban_group:first .o_kanban_record:first'); @@ -1793,13 +1793,13 @@ QUnit.module('Views', { // delete second column (first cancel the confirm request, then confirm) kanban.$('.o_kanban_group:last .o_column_delete').click(); // click on delete - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-default').click(); // click on cancel + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-default').click(); // click on cancel assert.strictEqual(kanban.$('.o_kanban_group:last').data('id'), 5, 'column [5, "xmo"] should still be there'); kanban.$('.o_kanban_group:last .o_column_delete').click(); // click on delete - assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // click on confirm + assert.ok($('[role="dialog"]').length, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // click on confirm assert.strictEqual(kanban.$('.o_kanban_group:last').data('id'), 3, 'last column should now be [3, "hello"]'); assert.strictEqual(kanban.$('.o_kanban_group').length, 2, "should still have two columns"); @@ -1870,7 +1870,7 @@ QUnit.module('Views', { assert.strictEqual(kanban.$('.o_kanban_group').length, 3, "should have two columns"); kanban.$('.o_kanban_group:last .o_column_delete').click(); - $('.modal .modal-footer .btn-primary').click(); + $('footer.modal-footer .btn-primary').click(); assert.strictEqual(kanban.$('.o_kanban_group').length, 2, "should have twos columns"); @@ -1912,33 +1912,33 @@ QUnit.module('Views', { // edit the title of column [5, 'xmo'] and close without saving kanban.$('.o_kanban_group[data-id=5] .o_column_edit').click(); // click on 'Edit' - assert.ok($('.modal .o_form_editable').length, 'a form view should be open in a modal'); - assert.strictEqual($('.modal .o_form_editable input').val(), 'xmo', + assert.ok($('[role="dialog"] .o_form_editable').length, 'a form view should be open in a modal'); + assert.strictEqual($('[role="dialog"] .o_form_editable input').val(), 'xmo', 'the name should be "xmo"'); - $('.modal .o_form_editable input').val('ged').trigger('input'); // change the value + $('[role="dialog"] .o_form_editable input').val('ged').trigger('input'); // change the value nbRPCs = 0; - $('.modal .modal-header .close').click(); // click on the cross to close the modal - assert.ok(!$('.modal').length, 'the modal should be closed'); + $('header.modal-header .close').click(); // click on the cross to close the modal + assert.ok(!$('[role="dialog"]').length, 'the modal should be closed'); assert.strictEqual(kanban.$('.o_kanban_group[data-id=5] .o_column_title').text(), 'xmo', 'title of the column should still be "xmo"'); assert.strictEqual(nbRPCs, 0, 'no RPC should have been done'); // edit the title of column [5, 'xmo'] and discard kanban.$('.o_kanban_group[data-id=5] .o_column_edit').click(); // click on 'Edit' - $('.modal .o_form_editable input').val('ged').trigger('input'); // change the value + $('[role="dialog"] .o_form_editable input').val('ged').trigger('input'); // change the value nbRPCs = 0; - $('.modal .modal-footer .btn-default').click(); // click on discard - assert.ok(!$('.modal').length, 'the modal should be closed'); + $('footer.modal-footer .btn-default').click(); // click on discard + assert.ok(!$('[role="dialog"]').length, 'the modal should be closed'); assert.strictEqual(kanban.$('.o_kanban_group[data-id=5] .o_column_title').text(), 'xmo', 'title of the column should still be "xmo"'); assert.strictEqual(nbRPCs, 0, 'no RPC should have been done'); // edit the title of column [5, 'xmo'] and save kanban.$('.o_kanban_group[data-id=5] .o_column_edit').click(); // click on 'Edit' - $('.modal .o_form_editable input').val('ged').trigger('input'); // change the value + $('[role="dialog"] .o_form_editable input').val('ged').trigger('input'); // change the value nbRPCs = 0; - $('.modal .modal-footer .btn-primary').click(); // click on save - assert.ok(!$('.modal').length, 'the modal should be closed'); + $('footer.modal-footer .btn-primary').click(); // click on save + assert.ok(!$('[role="dialog"]').length, 'the modal should be closed'); assert.strictEqual(kanban.$('.o_kanban_group[data-id=5] .o_column_title').text(), 'ged', 'title of the column should be "ged"'); assert.strictEqual(nbRPCs, 4, 'should have done 1 write, 1 read_group and 2 search_read'); @@ -2058,16 +2058,16 @@ QUnit.module('Views', { // click to see the examples kanban.$('.o_column_quick_create .o_kanban_examples').click(); - assert.strictEqual($('.modal .o_kanban_examples_dialog').length, 1, + assert.strictEqual($('[role="dialog"] .o_kanban_examples_dialog').length, 1, "should have open the examples dialog"); - assert.strictEqual($('.modal .o_kanban_examples_dialog_nav li').length, 2, + assert.strictEqual($('[role="dialog"] .o_kanban_examples_dialog_nav li').length, 2, "should have two examples (in the menu)"); - assert.strictEqual($('.modal .o_kanban_examples_dialog_nav a').text(), + assert.strictEqual($('[role="dialog"] .o_kanban_examples_dialog_nav a').text(), ' A first example A second example ', "example names should be correct"); - assert.strictEqual($('.modal .o_kanban_examples_dialog_content .tab-pane').length, 2, + assert.strictEqual($('[role="dialog"] .o_kanban_examples_dialog_content .tab-pane').length, 2, "should have two examples"); - var $firstPane = $('.modal .o_kanban_examples_dialog_content .tab-pane:first'); + var $firstPane = $('[role="dialog"] .o_kanban_examples_dialog_content .tab-pane:first'); assert.strictEqual($firstPane.find('.o_kanban_examples_group').length, 3, "there should be 3 stages in the first example"); assert.strictEqual($firstPane.find('h6').text(), 'Column 1Column 2Column 3', @@ -2075,7 +2075,7 @@ QUnit.module('Views', { assert.strictEqual($firstPane.find('.o_kanban_examples_description').text().trim(), "Some description", "the correct description should be displayed"); - var $secondPane = $('.modal .o_kanban_examples_dialog_content .tab-pane:nth(1)'); + var $secondPane = $('[role="dialog"] .o_kanban_examples_dialog_content .tab-pane:nth(1)'); assert.strictEqual($secondPane.find('.o_kanban_examples_group').length, 2, "there should be 2 stages in the second example"); assert.strictEqual($secondPane.find('h6').text(), 'Col 1Col 2', diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js index 8aa70c1c099..ed57c6968ac 100644 --- a/addons/web/static/tests/views/list_tests.js +++ b/addons/web/static/tests/views/list_tests.js @@ -880,7 +880,7 @@ QUnit.module('Views', { list.sidebar.$('a:contains(Delete)').click(); assert.ok($('body').hasClass('modal-open'), 'body should have modal-open clsss'); - $('body .modal-dialog button span:contains(Ok)').click(); + $('body [role="dialog"] button span:contains(Ok)').click(); assert.strictEqual(list.$('tbody td.o_list_record_selector').length, 3, "should have 3 records"); list.destroy(); @@ -916,13 +916,13 @@ QUnit.module('Views', { assert.verifySteps(['/web/dataset/search_read']); list.sidebar.$('a:contains(Archive)').click(); - assert.strictEqual($('.modal').length, 1, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-default').click(); // Click on 'Cancel' + assert.strictEqual($('[role="dialog"]').length, 1, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-default').click(); // Click on 'Cancel' assert.strictEqual(list.$('tbody td.o_list_record_selector').length, 4, "still should have 4 records"); list.sidebar.$('a:contains(Archive)').click(); - assert.strictEqual($('.modal').length, 1, 'a confirm modal should be displayed'); - $('.modal .modal-footer .btn-primary').click(); // Click on 'Ok' + assert.strictEqual($('[role="dialog"]').length, 1, 'a confirm modal should be displayed'); + $('footer.modal-footer .btn-primary').click(); // Click on 'Ok' assert.strictEqual(list.$('tbody td.o_list_record_selector').length, 3, "should have 3 records"); assert.verifySteps(['/web/dataset/search_read', '/web/dataset/call_kw/foo/write', '/web/dataset/search_read']); list.destroy(); @@ -2759,10 +2759,10 @@ QUnit.module('Views', { list.$('.o_data_cell:first').click(); list.$('input[name="foo"]').val("hello").trigger('input'); list.$buttons.find('.o_list_button_discard').click(); - assert.strictEqual($('.modal:visible').length, 1, + assert.strictEqual($('[role="dialog"]:visible').length, 1, "a modal to ask for discard should be visible"); - $('.modal:visible .btn-primary').click(); + $('[role="dialog"]:visible .btn-primary').click(); assert.strictEqual(list.$('.o_data_cell:first').text(), "yop", "first cell should still contain 'yop'"); @@ -3555,7 +3555,7 @@ QUnit.module('Views', { // delete a record list.$('.o_data_row:first .o_list_record_selector input').click(); list.sidebar.$('a:contains(Delete)').click(); - $('.modal .modal-footer .btn-primary').click(); // confirm + $('footer.modal-footer .btn-primary').click(); // confirm assert.verifySteps([ 'create', diff --git a/addons/web/static/tests/views/view_dialogs_tests.js b/addons/web/static/tests/views/view_dialogs_tests.js index 39484795f5a..2d6af1b5e14 100644 --- a/addons/web/static/tests/views/view_dialogs_tests.js +++ b/addons/web/static/tests/views/view_dialogs_tests.js @@ -90,9 +90,9 @@ QUnit.module('Views', { res_id: 1, }).open(); - assert.notOk($('div.modal .modal-body button').length, + assert.notOk($('main.modal-body button').length, "should not have any button in body"); - assert.strictEqual($('div.modal .modal-footer button').length, 1, + assert.strictEqual($('footer.modal-footer button').length, 1, "should have only one button in footer"); parent.destroy(); }); @@ -118,7 +118,7 @@ QUnit.module('Views', { res_id: 1, }).open(); - assert.strictEqual($('div.modal button.btn-primary').length, 1, + assert.strictEqual($('[role="dialog"] button.btn-primary').length, 1, "should have 1 buttons in modal"); $('.o_field_x2many_list_row_add a').click(); @@ -127,7 +127,7 @@ QUnit.module('Views', { keyCode: $.ui.keyCode.ESCAPE, })); - assert.strictEqual($('div.modal button.btn-primary').length, 1, + assert.strictEqual($('[role="dialog"] button.btn-primary').length, 1, "should still have 1 buttons in modal"); parent.destroy(); }); @@ -334,14 +334,14 @@ QUnit.module('Views', { form.$('.o_field_widget .o_field_many2one[name=instrument] input').click(); $('ul.ui-autocomplete.ui-front.ui-menu.ui-widget.ui-widget-content li.o_m2o_dropdown_option').first().click(); - var $modal = $('.modal-dialog.modal-lg'); + var $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'There should be one modal'); $modal.find('.o_field_x2many_list_row_add a').click(); - var $modals = $('.modal-dialog.modal-lg'); + var $modals = $('.modal-lg'); assert.equal($modals.length, 2, 'There should be two modals'); @@ -351,7 +351,7 @@ QUnit.module('Views', { $second_modal.find('.o_select_button').click(); - $modal = $('.modal-dialog.modal-lg'); + $modal = $('.modal-lg'); assert.equal($modal.length, 1, 'There should be one modal'); diff --git a/addons/web/static/tests/widgets/data_export_tests.js b/addons/web/static/tests/widgets/data_export_tests.js index 4569a5a6290..4948db07474 100644 --- a/addons/web/static/tests/widgets/data_export_tests.js +++ b/addons/web/static/tests/widgets/data_export_tests.js @@ -107,15 +107,15 @@ QUnit.module('widgets', { list.$('thead th.o_list_record_selector input').click(); list.sidebar.$('a:contains(Export)').click(); - assert.strictEqual($('.modal').length, 1, "a modal dialog should be open"); + assert.strictEqual($('[role="dialog"]').length, 1, "a modal dialog should be open"); assert.strictEqual($('span.o_tree_column:contains(Activities)').length, 1, "the Activities field should be in the list of exportable fields"); // select the field Description, click on add, then export and close - $('.modal span:contains(Description)').click(); - $('.modal .o_add_field').click(); - $('.modal span:contains(Export To File)').click(); - $('.modal span:contains(Close)').click(); + $('[role="dialog"] span:contains(Description)').click(); + $('[role="dialog"] .o_add_field').click(); + $('[role="dialog"] span:contains(Export To File)').click(); + $('[role="dialog"] span:contains(Close)').click(); list.destroy(); framework.blockUI = blockUI; @@ -185,26 +185,26 @@ QUnit.module('widgets', { // Open the export modal list.$('thead th.o_list_record_selector input').click(); list.sidebar.$('a:contains(Export)').click(); - assert.strictEqual($('.modal').length, 1, + assert.strictEqual($('[role="dialog"]').length, 1, "a modal dialog should be open"); // Select 'Activities' in fields to export - assert.strictEqual($('.modal select.o_fields_list option').length, 0, + assert.strictEqual($('[role="dialog"] select.o_fields_list option').length, 0, "the fields list should be empty"); - $('.modal .o_export_tree_item:contains(Activities)').click(); - $('.modal button:contains(Add)').click(); - assert.strictEqual($('.modal select.o_fields_list option').length, 1, + $('[role="dialog"] .o_export_tree_item:contains(Activities)').click(); + $('[role="dialog"] button:contains(Add)').click(); + assert.strictEqual($('[role="dialog"] select.o_fields_list option').length, 1, "there should be one item in the fields list"); // Save fields list - $('.modal a:contains(Save fields list)').click(); - $('.modal .o_save_list > input').val('fields list').trigger('input'); - $('.modal .o_save_list > button').click(); + $('[role="dialog"] a:contains(Save fields list)').click(); + $('[role="dialog"] .o_save_list > input').val('fields list').trigger('input'); + $('[role="dialog"] .o_save_list > button').click(); assert.verifySteps(['build_search_data', 'create'], "create should have been called"); // Close the modal and destroy list - $('.modal button span:contains(Close)').click(); + $('[role="dialog"] button span:contains(Close)').click(); list.destroy(); // restore create function |