From 7d475b1ac4e816849a90f9a2892191a9d447418e Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 15 Mar 2016 12:47:26 +0100
Subject: [PATCH] Improved error handling.

---
 test/browser/agent_organization_profile_test.rb | 11 +++++------
 test/browser/agent_user_profile_test.rb         | 15 +++++++--------
 test/browser_test_helper.rb                     |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/test/browser/agent_organization_profile_test.rb b/test/browser/agent_organization_profile_test.rb
index c273de8e7..de8e0403c 100644
--- a/test/browser/agent_organization_profile_test.rb
+++ b/test/browser/agent_organization_profile_test.rb
@@ -33,12 +33,12 @@ class AgentOrganizationProfileTest < TestCase
       css: '.active .profile [data-name="note"]',
       value: note,
     )
-    click( css: '.empty-search' )
+    empty_search()
     sleep 2
 
     # check and change note again in edit screen
-    click( css: '.active .js-action .icon-arrow-down', fast: true )
-    click( css: '.active .js-action [data-type="edit"]' )
+    click(css: '.active .js-action .icon-arrow-down', fast: true)
+    click(css: '.active .js-action [data-type="edit"]')
 
     watch_for(
       css: '.active .modal',
@@ -53,7 +53,7 @@ class AgentOrganizationProfileTest < TestCase
       css: '.active .modal [data-name="note"]',
       value: 'some note abc',
     )
-    click( css: '.active .modal button.js-submit' )
+    click(css: '.active .modal button.js-submit')
 
     watch_for(
       css: '.active .profile-window',
@@ -112,9 +112,8 @@ class AgentOrganizationProfileTest < TestCase
       css: '.active .profile [data-name="note"]',
       value: message,
     )
-    click(
+    empty_search(
       browser: browser1,
-      css:     '.empty-search',
     )
 
     # verify
diff --git a/test/browser/agent_user_profile_test.rb b/test/browser/agent_user_profile_test.rb
index 7468cde67..0ac2850f9 100644
--- a/test/browser/agent_user_profile_test.rb
+++ b/test/browser/agent_user_profile_test.rb
@@ -14,7 +14,7 @@ class AgentUserProfileTest < TestCase
     tasks_close_all()
 
     # search and open user
-    user_open_by_search( value: 'Braun' )
+    user_open_by_search(value: 'Braun')
 
     watch_for(
       css: '.active .profile-window',
@@ -30,12 +30,12 @@ class AgentUserProfileTest < TestCase
       css: '.active [data-name="note"]',
       value: 'some note 123',
     )
-    click( css: '.empty-search' )
+    empty_search()
     sleep 2
 
     # check and change note again in edit screen
-    click( css: '.active .js-action .icon-arrow-down' )
-    click( css: '.active .js-action [data-type="edit"]' )
+    click(css: '.active .js-action .icon-arrow-down')
+    click(css: '.active .js-action [data-type="edit"]')
 
     watch_for(
       css: '.active .modal',
@@ -50,7 +50,7 @@ class AgentUserProfileTest < TestCase
       css: '.modal [data-name="note"]',
       value: 'some note abc',
     )
-    click( css: '.active .modal button.js-submit' )
+    click(css: '.active .modal button.js-submit')
 
     watch_for(
       css: '.active .profile-window',
@@ -68,7 +68,7 @@ class AgentUserProfileTest < TestCase
     )
 
     # switch to org tab, verify if ticket is shown
-    user_open_by_search( value: 'Braun' )
+    user_open_by_search(value: 'Braun')
     watch_for(
       css: '.active .profile-window',
       value: 'user profile check ' + message,
@@ -107,9 +107,8 @@ class AgentUserProfileTest < TestCase
       css: '.active [data-name="note"]',
       value: message,
     )
-    click(
+    empty_search(
       browser: browser1,
-      css:     '.empty-search',
     )
 
     watch_for(
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index d7c4d3085..6e15d4924 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -2353,7 +2353,7 @@ wait untill text in selector disabppears
     @last_used_browser = instance
   end
 
-  def log(method, params)
+  def log(method, params = {})
     return if !@@debug
     return if params[:mute_log]
     puts "#{Time.zone.now}/#{method}: #{params.inspect}"