From 96b2f542dc38fd810a133e19f9c0fb9c52a7fb79 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 15 Jul 2013 12:22:02 +0200
Subject: [PATCH] Added implicit_wait for selenium tests.

---
 test/browser/aaa_getting_started_test.rb         | 13 ++++---------
 test/browser/agent_ticket_actions_level1_test.rb | 16 +++-------------
 test/browser/agent_ticket_actions_level2_test.rb | 13 +++----------
 test/browser/agent_ticket_actions_level3_test.rb | 16 +---------------
 test/browser_test_helper.rb                      |  2 ++
 5 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb
index 182b7fd67..d1ea88fc3 100644
--- a/test/browser/aaa_getting_started_test.rb
+++ b/test/browser/aaa_getting_started_test.rb
@@ -107,20 +107,15 @@ class AaaGettingStartedTest < TestCase
             :execute => 'click',
             :css     => '#form-agent button[type="submit"]',
           },
-          {
-            :execute => 'wait',
-            :value   => 2,
-          },
-          {
-            :execute => 'check',
-            :css     => '#login',
-            :result  => false,
-          },
           {
             :execute => 'check',
             :element => :url,
             :result  => '#getting_started',
           },
+          {
+            :execute => 'wait',
+            :value   => 2,
+          },
 
           # check action
           {
diff --git a/test/browser/agent_ticket_actions_level1_test.rb b/test/browser/agent_ticket_actions_level1_test.rb
index 6c31dea02..83f8eb319 100644
--- a/test/browser/agent_ticket_actions_level1_test.rb
+++ b/test/browser/agent_ticket_actions_level1_test.rb
@@ -71,12 +71,7 @@ class AgentTicketActionLevel1Test < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 5,
-          },
-          {
-            :execute => 'check',
-            :css     => '#login',
-            :result  => false,
+            :value   => 6,
           },
           {
             :execute => 'check',
@@ -202,12 +197,7 @@ class AgentTicketActionLevel1Test < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 5,
-          },
-          {
-            :execute => 'check',
-            :css     => '#login',
-            :result  => false,
+            :value   => 6,
           },
           {
             :execute => 'check',
@@ -245,7 +235,7 @@ class AgentTicketActionLevel1Test < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 4,
+            :value   => 5,
           },
           {
             :execute      => 'match',
diff --git a/test/browser/agent_ticket_actions_level2_test.rb b/test/browser/agent_ticket_actions_level2_test.rb
index c890c20fa..b67feaecf 100644
--- a/test/browser/agent_ticket_actions_level2_test.rb
+++ b/test/browser/agent_ticket_actions_level2_test.rb
@@ -27,10 +27,6 @@ class AgentTicketActionsLevel2Test < TestCase
             :css     => '#login',
             :result  => false,
           },
-          {
-            :execute => 'wait',
-            :value   => 1,
-          },
           {
             :where   => :instance1,
             :execute => 'close_all_tasks',
@@ -61,10 +57,6 @@ class AgentTicketActionsLevel2Test < TestCase
             :css     => '.active .ticket_create',
             :result  => true,
           },
-          {
-            :execute => 'wait',
-            :value   => 1,
-          },
           {
             :where   => :instance1,
             :execute => 'set',
@@ -232,8 +224,9 @@ class AgentTicketActionsLevel2Test < TestCase
             :value        => '$(".active .ticket-title .ticket-title-update").blur()',
           },
           {
-            :execute => 'wait',
-            :value   => 1,
+            :where        => :instance2,
+            :execute      => 'js',
+            :value        => '$(".active .ticket-title .ticket-title-update").trigger("blur")',
           },
 
 
diff --git a/test/browser/agent_ticket_actions_level3_test.rb b/test/browser/agent_ticket_actions_level3_test.rb
index b6ed51074..ad2fab849 100644
--- a/test/browser/agent_ticket_actions_level3_test.rb
+++ b/test/browser/agent_ticket_actions_level3_test.rb
@@ -27,10 +27,6 @@ class AgentTicketActionsLevel3Test < TestCase
             :css     => '#login',
             :result  => false,
           },
-          {
-            :execute => 'wait',
-            :value   => 1,
-          },
           {
             :where   => :instance1,
             :execute => 'close_all_tasks',
@@ -61,10 +57,6 @@ class AgentTicketActionsLevel3Test < TestCase
             :css     => '.active .ticket_create',
             :result  => true,
           },
-          {
-            :execute => 'wait',
-            :value   => 1,
-          },
           {
             :where   => :instance1,
             :execute => 'set',
@@ -112,13 +104,7 @@ class AgentTicketActionsLevel3Test < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 5,
-          },
-          {
-            :where   => :instance1,
-            :execute => 'check',
-            :css     => '#login',
-            :result  => false,
+            :value   => 6,
           },
           {
             :where   => :instance1,
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 3bcad8f87..001cb0bed 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -26,6 +26,7 @@ class TestCase < Test::Unit::TestCase
     if !ENV['REMOTE_URL']
       local_browser = Selenium::WebDriver.for( browser.to_sym )
       local_browser.manage.window.resize_to(1024, 1024)
+      local_browser.manage.timeouts.implicit_wait = 3 # seconds
       @browsers.push local_browser
       return local_browser
     end
@@ -38,6 +39,7 @@ class TestCase < Test::Unit::TestCase
       :url                  => ENV['REMOTE_URL'],
       :desired_capabilities => caps,
     )
+    local_browser.manage.timeouts.implicit_wait = 3 # seconds
     @browsers.push local_browser
     return local_browser
   end