From b62b67293e7f0907978bafd508885ddab143d0ca Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 5 Dec 2015 20:44:43 +0100 Subject: [PATCH] Improved set of contenteditable fields. --- .../browser/agent_organization_profile_test.rb | 2 -- .../agent_ticket_actions_level0_test.rb | 3 +++ test/browser/agent_user_profile_test.rb | 3 --- test/browser/customer_ticket_create_test.rb | 1 + test/browser_test_helper.rb | 18 ++++++++++-------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/test/browser/agent_organization_profile_test.rb b/test/browser/agent_organization_profile_test.rb index 70956e8ca..c273de8e7 100644 --- a/test/browser/agent_organization_profile_test.rb +++ b/test/browser/agent_organization_profile_test.rb @@ -32,7 +32,6 @@ class AgentOrganizationProfileTest < TestCase set( css: '.active .profile [data-name="note"]', value: note, - contenteditable: true, ) click( css: '.empty-search' ) sleep 2 @@ -112,7 +111,6 @@ class AgentOrganizationProfileTest < TestCase browser: browser1, css: '.active .profile [data-name="note"]', value: message, - contenteditable: true, ) click( browser: browser1, diff --git a/test/browser/agent_ticket_actions_level0_test.rb b/test/browser/agent_ticket_actions_level0_test.rb index 08ea9115c..ed2e02351 100644 --- a/test/browser/agent_ticket_actions_level0_test.rb +++ b/test/browser/agent_ticket_actions_level0_test.rb @@ -190,11 +190,13 @@ class AgentTicketActionLevel0Test < TestCase browser: browser2, css: '.active div[data-name=body]', value: 'test', + no_click: true, ) set( browser: browser2, css: '.active div[data-name=body]', value: '::' + random, + no_click: true, ) sendkey( browser: browser2, @@ -247,6 +249,7 @@ class AgentTicketActionLevel0Test < TestCase browser: browser2, css: '.active div[data-name=body]', value: '::' + random, + no_click: true, ) sendkey( diff --git a/test/browser/agent_user_profile_test.rb b/test/browser/agent_user_profile_test.rb index cbd1b4bba..7468cde67 100644 --- a/test/browser/agent_user_profile_test.rb +++ b/test/browser/agent_user_profile_test.rb @@ -29,8 +29,6 @@ class AgentUserProfileTest < TestCase set( css: '.active [data-name="note"]', value: 'some note 123', - contenteditable: true, - ) click( css: '.empty-search' ) sleep 2 @@ -108,7 +106,6 @@ class AgentUserProfileTest < TestCase browser: browser1, css: '.active [data-name="note"]', value: message, - contenteditable: true, ) click( browser: browser1, diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb index 9cc8e5b56..b1fa624ee 100644 --- a/test/browser/customer_ticket_create_test.rb +++ b/test/browser/customer_ticket_create_test.rb @@ -44,6 +44,7 @@ class CustomerTicketCreateTest < TestCase set( css: '.active [data-name="body"]', value: 'some body 1234 äöüß', + no_click: true, ) task_type( diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index f69c27109..6e29c028d 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -384,13 +384,13 @@ class TestCase < Test::Unit::TestCase =begin set( - browser: browser1, - css: '.some_class', - value: true, - slow: false, - blur: true, - clear: true, # todo | default: true - contenteditable: true + browser: browser1, + css: '.some_class', + value: true, + slow: false, + blur: true, + clear: true, # todo | default: true + no_click: true, ) =end @@ -402,7 +402,9 @@ class TestCase < Test::Unit::TestCase instance = params[:browser] || @browser element = instance.find_elements( { css: params[:css] } )[0] - element.click + if !params[:no_click] + element.click + end element.clear if !params[:slow]