summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-21 12:42:34 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-21 12:42:34 +0200
commitd73f0d8063aaa38aeb77b8a513df84123eaefd11 (patch)
tree885b0ccbca6a74b15e3baf83adf3b0abcdb9f681 /addons/web/static
parent10148c3c3ab0a2d7ad2924170a69526aacda7637 (diff)
parent68f51630b923a9dbd0efdac28a2373e0742da005 (diff)
[MERGE] forward port of branch saas-9 up to 68f5163
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/test/x2many.js44
1 files changed, 37 insertions, 7 deletions
diff --git a/addons/web/static/test/x2many.js b/addons/web/static/test/x2many.js
index f57b03bcb1d..f45df41334e 100644
--- a/addons/web/static/test/x2many.js
+++ b/addons/web/static/test/x2many.js
@@ -69,8 +69,43 @@ Tour.register({
waitFor: '.tab-pane:last tr:has(.oe_list_field_cell):not(:has(.oe_list_record_selector)):contains(user_test)',
},
+ // add ourself as participant
+ {
+ title: "change tab to Participants",
+ element: '[data-toggle="tab"]:contains(Participants)'
+ },
+ {
+ title: "click to add participants",
+ element: '.tab-pane:eq(2).active .oe_form_field_x2many_list_row_add a'
+ },
+ {
+ title: "select Admin",
+ element: '.modal .oe_list_content tr:has(td[data-field="name"]:containsExact(Administrator)) .oe_list_record_selector input[type="checkbox"]'
+ },
+ {
+ title: "save selected participants",
+ waitFor: '.modal .oe_list_content tr:has(td[data-field="name"]:containsExact(Administrator)) .oe_list_record_selector input[type="checkbox"]:propChecked',
+ element: '.o_selectcreatepopup_search_select'
+ },
+
+ // save
+ {
+ title: "save discussion",
+ waitFor: '.oe_form_field_many2many tbody tr td.oe_list_field_char:containsExact(Administrator)',
+ element: 'button.oe_form_button_save'
+ },
+ // edit
+ {
+ title: "edit discussion",
+ element: 'button.oe_form_button_edit'
+ },
+
// add message a
{
+ title: "Select First Tab",
+ element: 'a[role=tab]:first',
+ },
+ {
title: "create new message a",
element: '.oe_form_field_x2many_list_row_add:first a'
},
@@ -167,15 +202,10 @@ Tour.register({
},
{
title: "click to add participants",
- element: '.tab-pane:eq(1).active .oe_form_field_x2many_list_row_add a'
- },
- {
- title: "select Admin",
- element: '.modal .oe_list_content tr:has(td[data-field="name"]:containsExact(Administrator)) .oe_list_record_selector input[type="checkbox"]'
+ element: '.tab-pane:eq(2).active .oe_form_field_x2many_list_row_add a'
},
{
title: "select Demo User",
- waitFor: '.modal .oe_list_content tr:has(td[data-field="name"]:containsExact(Administrator)) .oe_list_record_selector input[type="checkbox"]:propChecked',
element: '.modal .oe_list_content tr:has(td[data-field="name"]:containsExact(Demo User)) .oe_list_record_selector input[type="checkbox"]'
},
{
@@ -214,7 +244,7 @@ Tour.register({
element: 'button.oe_form_button_edit'
},
{
- title: "change tab to Participants",
+ title: "change tab to Messages",
waitFor: '.oe_form_editable',
element: '[data-toggle="tab"]:contains(Messages)'
},