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

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

diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index 0ed755a0953d066b0381da4f95a70ab2b77e9b9d..d7b9f279e9d3d874ca3240d604749efa9e25173f 100644 (file)
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -70,7 +70,10 @@ class SiteTest < ApplicationSystemTestCase
       assert_no_selector ".tooltip", :text => "Zoom in"
       find("h1").hover # un-hover original element
 
       assert_no_selector ".tooltip", :text => "Zoom in"
       find("h1").hover # un-hover original element
 

-      visit "/#map=10/0/0"
+      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_selector ".tooltip", :text => "Zoom in"
     end
       find(selector).hover
       assert_selector ".tooltip", :text => "Zoom in"
     end