Merge remote-tracking branch 'upstream/pull/5346'

[rails.git] / test / system / site_test.rb

diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index 65167989ac24d8ab17dd182401406970efd8c28d..d7b9f279e9d3d874ca3240d604749efa9e25173f 100644 (file)
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -71,9 +71,10 @@ class SiteTest < ApplicationSystemTestCase
       find("h1").hover # un-hover original element
 
       visit "#map=10/0/0"
       find("h1").hover # un-hover original element
 
       visit "#map=10/0/0"

+      find("#{selector}.disabled") # Ensure that capybara has waited for JS to finish processing
+

       assert_no_selector ".tooltip"
       find(selector).hover
       assert_no_selector ".tooltip"
       find(selector).hover

-      sleep(0.2)

       assert_selector ".tooltip", :text => "Zoom in"
     end
   end
       assert_selector ".tooltip", :text => "Zoom in"
     end
   end