Merge tooltip fixes/tests

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 2633d103794d6e6af8396545b49f7568be3900ae..d762696a18e556b4ffa5fb2548733ae9bd512251 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -145,7 +145,7 @@ L.OSM.layers = function (options) {
           }
 
           $(item).attr("class", disabled ? "disabled" : "");
-          item.attr("data-bs-original-title", disabled ?
+          item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
             I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
         });
       };

diff --git a/test/system/site_test.rb b/test/system/site_test.rb
index a08f7f344cd55672a935b85fc7b5af00e53f4f93..2809feb93bc3a2f16d4566109ce4d7c713dbfcb9 100644 (file)
--- a/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@ -49,23 +49,17 @@ class SiteTest < ApplicationSystemTestCase
     tooltip.assert_no_text "Zoom in"
   end
 
-  test "tooltip shows for query button when zoomed out" do
-    visit "/#map=10/0/0"
+  [
+    "#edit_tab",
+    ".control-note .control-button",
+    ".control-query .control-button"
+  ].each do |selector|
+    test "tooltips on low zoom levels for disabled control '#{selector}'" do
+      visit "/#map=10/0/0"
 
-    assert_no_selector ".tooltip"
-    button = find ".control-query .control-button"
-    button.hover
-    tooltip = find ".tooltip"
-    tooltip.assert_text "Zoom in to query features"
-  end
-
-  test "tooltip shows for edit button when zoomed out" do
-    visit "/#map=11/0/0"
-
-    assert_no_selector ".tooltip"
-    button = find "#edit_tab"
-    button.hover
-    tooltip = find ".tooltip"
-    tooltip.assert_text "Zoom in to edit the map"
+      assert_no_selector ".tooltip"
+      find(selector).hover
+      assert_selector ".tooltip", :text => "Zoom in"
+    end
   end
 end