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

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

diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index f918b897aa529ff1d05b789446db2041db121087..d7b9f279e9d3d874ca3240d604749efa9e25173f 100644 (file)
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -61,10 +61,27 @@ class SiteTest < ApplicationSystemTestCase
       find(selector).hover
       assert_selector ".tooltip", :text => "Zoom in"
     end
+
+    test "no zoom-in tooltips on high zoom levels, then tooltips appear after zoom out for control '#{selector}'" do
+      visit "/#map=14/0/0"
+
+      assert_no_selector ".tooltip"
+      find(selector).hover
+      assert_no_selector ".tooltip", :text => "Zoom in"
+      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_selector ".tooltip", :text => "Zoom in"
+    end
   end
 
   test "notes layer tooltip appears on zoom out" do
     visit "/#map=9/40/-4" # depends on zoom levels where notes are allowed
+
     find(".control-layers .control-button").click
     li = find(".layers-ui .overlay-layers li:first-child")
     li.not_matches_css? ".disabled"