geoblacklight 4.7.0 → 5.0.0.pre.alpha.11

data/spec/features/configurable_basemap_spec.rb

@@ -34,60 +34,4 @@ feature "Configurable basemap", js: true do
       expect(page).to have_css "img[src*='hot']"
     end
   end
-  feature "with a configured tile URL for a shipped basemap" do
-    before do
-      CatalogController.blacklight_config.basemap_provider = "positron"
-      Settings.LEAFLET.BASEMAPS = {
-        positron: {
-          url: "https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png?key=fake-carto-key"
-        }
-      }
-    end
-    after { Settings.LEAFLET.BASEMAPS = nil }
-
-    scenario "requests tiles from the configured URL" do
-      visit root_path
-      expect(page).to have_css "img[src*='key=fake-carto-key']"
-    end
-    scenario "keeps the attribution from the shipped definition" do
-      visit root_path
-      expect(page).to have_css ".leaflet-control-attribution", text: "Carto"
-    end
-  end
-  feature "with a basemap the application defines itself" do
-    before do
-      CatalogController.blacklight_config.basemap_provider = "myBasemap"
-      Settings.LEAFLET.BASEMAPS = {
-        myBasemap: {
-          url: "/tiles/{z}/{x}/{y}.png",
-          attribution: "Tiles courtesy of Example University",
-          maxZoom: 18
-        }
-      }
-    end
-    after { Settings.LEAFLET.BASEMAPS = nil }
-
-    scenario "requests tiles from the application's basemap" do
-      visit root_path
-      # visible: :all because these tiles 404, so the images have no dimensions
-      expect(page).to have_css "img[src*='/tiles/']", visible: :all
-    end
-    scenario "credits the application's basemap" do
-      visit root_path
-      expect(page).to have_css ".leaflet-control-attribution",
-        text: "Tiles courtesy of Example University"
-    end
-  end
-  feature "using a basemap GeoBlacklight no longer ships" do
-    before do
-      # worldEco was one of the CARTO basemaps served from the retired
-      # cartocdn fastly endpoints; applications still naming one should get a
-      # working basemap rather than none
-      CatalogController.blacklight_config.basemap_provider = "worldEco"
-    end
-    scenario "falls back to positron rather than drawing no basemap" do
-      visit root_path
-      expect(page).to have_css "img[src*='light_all']", visible: :all
-    end
-  end
 end

data/spec/features/download_layer_spec.rb

@@ -5,39 +5,50 @@ require "spec_helper"
 feature "Download layer" do
   let(:shapefile_download) { instance_double(Geoblacklight::ShapefileDownload) }
   let(:kmz_download) { instance_double(Geoblacklight::KmzDownload) }
+  let(:csv_download) { instance_double(Geoblacklight::CsvDownload) }
 
   before do
     allow(Geoblacklight::ShapefileDownload).to receive(:new).and_return(shapefile_download)
     allow(Geoblacklight::KmzDownload).to receive(:new).and_return(kmz_download)
+    allow(Geoblacklight::CsvDownload).to receive(:new).and_return(csv_download)
+  end
+
+  # cleanup any downloaded files
+  after do
+    FileUtils.rm("tufts-cambridgegrid100-04-shapefile.zip", force: true)
+    FileUtils.rm("tufts-cambridgegrid100-04-kmz.kmz", force: true)
   end
 
   scenario "clicking initial shapefile download button should trigger download", js: true do
-    expect(shapefile_download).to receive(:get).and_return("mit-f6rqs4ucovjk2-shapefile.zip")
-    visit solr_document_path("mit-f6rqs4ucovjk2")
+    allow(shapefile_download).to receive(:get).and_return("tufts-cambridgegrid100-04-shapefile.zip")
+    visit solr_document_path("tufts-cambridgegrid100-04")
     find("#downloads-button").click
     find('a[data-download-type="shapefile"]', text: "Export Shapefile").click
     expect(page).to have_css(
-      'a[href="/download/file/mit-f6rqs4ucovjk2-shapefile.zip"]',
-      text: "Your file mit-f6rqs4ucovjk2-shapefile.zip is ready for download"
+      'a[href="/download/file/tufts-cambridgegrid100-04-shapefile.zip"]',
+      text: "Your file tufts-cambridgegrid100-04-shapefile.zip is ready for download"
     )
   end
 
   scenario "failed download should return message with link to layer", js: true do
-    expect(shapefile_download).to receive(:get).and_raise(Geoblacklight::Exceptions::ExternalDownloadFailed.new(message: "Failed", url: "http://www.example.com/failed"))
+    allow(shapefile_download).to receive(:get).and_raise(Geoblacklight::Exceptions::ExternalDownloadFailed.new(
+      message: "Failed", url: "http://www.example.com/failed"
+    ))
     visit solr_document_path("mit-f6rqs4ucovjk2")
     find("#downloads-button").click
     find('#downloads-collapse a[data-download-type="shapefile"]', text: "Export Shapefile").click
+    expect(page).to have_text "Download failed (shapefile)"
     expect(page).to have_css "div.alert.alert-danger", text: "Sorry, the requested file could not be downloaded."
   end
 
   scenario "clicking kmz download button should trigger download", js: true do
-    expect(kmz_download).to receive(:get).and_return("mit-f6rqs4ucovjk2-kmz.kmz")
-    visit solr_document_path("mit-f6rqs4ucovjk2")
+    allow(kmz_download).to receive(:get).and_return("tufts-cambridgegrid100-04-kmz.kmz")
+    visit solr_document_path("tufts-cambridgegrid100-04")
     find("#downloads-button").click
     find('#downloads-collapse a[data-download-type="kmz"]', text: "Export KMZ").click
     expect(page).to have_css(
-      'a[href="/download/file/mit-f6rqs4ucovjk2-kmz.kmz"]',
-      text: "Your file mit-f6rqs4ucovjk2-kmz.kmz is ready for download"
+      'a[href="/download/file/tufts-cambridgegrid100-04-kmz.kmz"]',
+      text: "Your file tufts-cambridgegrid100-04-kmz.kmz is ready for download"
     )
   end
 
@@ -50,11 +61,13 @@ feature "Download layer" do
   scenario "clicking jpg download button should redirect to external image" do
     visit solr_document_path("princeton-02870w62c")
     find("#downloads-button").click
-    expect(page).to have_css("#downloads-collapse a[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: "Original JPG")
+    expect(page).to have_css(
+      "#downloads-collapse a[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: "Original JPG"
+    )
   end
 
   scenario "options should be available under toggle" do
-    visit solr_document_path("mit-f6rqs4ucovjk2")
+    visit solr_document_path("tufts-cambridgegrid100-04")
     find("#downloads-button").click
     expect(page).to have_css('#downloads-collapse a[data-download-type="shapefile"]', text: "Export Shapefile")
     expect(page).to have_css('#downloads-collapse a[data-download-type="kmz"]', text: "Export KMZ")
@@ -80,32 +93,4 @@ feature "Download layer" do
     expect(page).to have_css("#downloads-collapse a", text: "Original")
     expect(page).to have_css("#downloads-collapse a", text: "Export")
   end
-
-  scenario "clicking download GeoTIFF for Harvard layer should show email form", js: true do
-    visit solr_document_path("harvard-g7064-s2-1834-k3")
-    find("#downloads-button").click
-    find('a[data-download-type="harvard-hgl"]', text: "GeoTIFF").click
-    expect(page).to have_css("#hglRequest")
-  end
-
-  context "with a successful request to the server" do
-    let(:hgl_download) { instance_double(Geoblacklight::HglDownload) }
-
-    xscenario "submitting email form should trigger HGL request", js: true do
-      # There are currently difficulties with testing the HGL downloader
-      visit solr_document_path("harvard-g7064-s2-1834-k3")
-      find("#downloads-button").click
-      find('a[data-download-type="harvard-hgl"]', text: "Original GeoTIFF").click
-
-      allow_any_instance_of(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)
-      allow(hgl_download).to receive(:get).and_return("success")
-
-      within "#hglRequest" do
-        fill_in("Email", with: "foo@example.com")
-        click_button("Request")
-      end
-      expect(page).to have_css(".alert-success")
-      expect(page).to have_content("You should receive an email when your download is ready")
-    end
-  end
 end

data/spec/features/esri_viewer_spec.rb

@@ -30,7 +30,7 @@ feature "feature_layer reference", js: true do
   end
   scenario "displays tiled map layer" do
     skip "spec depend on potentially flaky external services"
-    visit solr_document_path "nyu-test-soil-survey-map"
+    visit solr_document_path "31567cf1-bad8-4bc5-8d57-44b96c207ecc"
     expect(page).to have_css ".leaflet-control-zoom", visible: true
     expect(page).to have_css "img.leaflet-tile.leaflet-tile-loaded", visible: true
   end

data/spec/features/exports_spec.rb

@@ -3,15 +3,6 @@
 require "spec_helper"
 
 feature "Export features" do
-  feature "when item is public and wfs is available" do
-    feature "Open in Carto" do
-      scenario "shows up in tools" do
-        visit solr_document_path "tufts-cambridgegrid100-04"
-        expect(page).to have_css "li.carto a", text: "Open in Carto"
-        click_link "Open in Carto"
-      end
-    end
-  end
   feature "when esri web services are available" do
     feature "Open in ArcGIS Online" do
       scenario "shows up in tools" do
@@ -20,10 +11,4 @@ feature "Export features" do
       end
     end
   end
-  feature "when restricted or no wfs" do
-    scenario "is not in tools" do
-      visit solr_document_path "princeton-02870w62c"
-      expect(page).not_to have_css "li.carto a", text: "Open in Carto"
-    end
-  end
 end

data/spec/features/{full_screen_controll_spec.rb → full_screen_control_spec.rb}

@@ -3,14 +3,9 @@
 require "spec_helper"
 
 feature "Leaflet fullscreen control", js: true do
-  scenario "IIIF layer should have full screen control" do
-    visit solr_document_path("princeton-02870w62c")
-    expect(page).to have_css(".leaflet-control-fullscreen-button")
-  end
-
   scenario "WMS layer should have full screen control" do
     visit solr_document_path("stanford-cz128vq0535")
-    expect(page).to have_css(".leaflet-control-fullscreen-button")
+    expect(page).to have_css(".leaflet-control-fullscreen-button", visible: :all)
   end
 end
 
@@ -19,4 +14,9 @@ feature "Clover IIIF fullscreen control", js: true do
     visit solr_document_path("princeton-sx61dn82p")
     expect(page).to have_button("Toggle full page")
   end
+
+  scenario "IIIF image should have full screen control" do
+    visit solr_document_path("princeton-02870w62c")
+    expect(page).to have_css("[data-button='full-page']")
+  end
 end

data/spec/features/home_page_spec.rb

@@ -6,18 +6,19 @@ feature "Home page", js: true do # use js: true for tests which require js, but
   before do
     visit root_path
   end
+
   scenario "navbar" do
     expect(page).to have_css "#bookmarks_nav"
     expect(page).to have_css "a", text: "History"
   end
+
   scenario "search bar" do
     expect(page).not_to have_css "#search-navbar"
-    within ".jumbotron" do
-      expect(page).to have_css "h2", text: "Explore and discover..."
-      expect(page).to have_css "h3", text: "Find the maps and data you need"
-      expect(page).to have_css "form.search-query-form"
-    end
+    expect(page).to have_css "h1", text: "Explore and discover..."
+    expect(page).to have_css "h2", text: "Find the maps and data you need"
+    expect(page).to have_css "form.search-query-form"
   end
+
   scenario "find by category" do
     expect(page).to have_css ".category-block", count: 4
     expect(page).to have_css ".home-facet-link", count: 36
@@ -26,24 +27,28 @@ feature "Home page", js: true do # use js: true for tests which require js, but
     expect(page).to have_css ".filter-name", text: "Subject"
     expect(page).to have_css ".filter-value", text: "Counties"
   end
+
   scenario "map should be visible" do
     within "#main-container" do
-      expect(page).to have_css("#map")
+      expect(page).to have_css("#leaflet-viewer")
       expect(page).to have_css("img.leaflet-tile", minimum: 3)
     end
   end
+
   scenario "clicking map search should create a spatial search" do
-    within "#map" do
+    within "#leaflet-viewer" do
       find(".search-control a").click
       expect(page.current_url).to match(/bbox=/)
     end
     expect(page).to have_css "#documents"
   end
+
   scenario "can search by placename" do
     click_link "New York, New York"
     results = page.all(:css, "article.document")
     expect(results.count).to equal(4)
   end
+
   scenario "pages should have meta tag with geoblacklight version" do
     expect(page.body).to include("geoblacklight-version")
   end

data/spec/features/iiif_viewer_spec.rb

@@ -5,6 +5,6 @@ require "spec_helper"
 feature "iiif reference" do
   scenario "displays leaflet viewer", js: true do
     visit solr_document_path("princeton-02870w62c")
-    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css '[data-button="zoom-in"]', visible: true
   end
 end

data/spec/features/index_map_spec.rb

@@ -2,31 +2,38 @@
 
 require "spec_helper"
 
-feature "Index map" do
+feature "Index map", js: true do
   # Colors
   default_color = "#7FCDBB"
   selected_color = "#2C7FB8"
-  scenario "displays index map viewer (polygon)", js: true do
+  scenario "displays index map viewer (polygon)" do
+    skip "Doesn't work for importmaps when headless in CI" if ENV["CI"] && ENV.fetch("ASSET_PIPELINE") == "importmap"
+
     visit solr_document_path("stanford-fb897vt9938")
     # Wait until SVG elements are added
     expect(page).to have_css ".leaflet-overlay-pane svg"
-    within "#map" do
+    within "#leaflet-viewer" do
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{default_color}']"
-      find("svg g path:nth-child(2)").click
+      # Click the top-left corner of the polygon instead of the center
+      # to prevent it being occluded by other DOM elements (occurs in headless mode)
+      find("svg g path:nth-child(2)").click(x: 1, y: 1)
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{selected_color}']"
-      first("svg g path").click
+      first("svg g path").click(x: 1, y: 1)
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{default_color}']"
     end
   end
-  scenario "displays index map viewer (points)", js: true do
+
+  scenario "displays index map viewer (points)" do
+    skip "Doesn't work for importmaps when headless in CI" if ENV["CI"] && ENV.fetch("ASSET_PIPELINE") == "importmap"
+
     visit solr_document_path("cornell-ny-aerial-photos-1960s")
     # Wait until SVG elements are added
     expect(page).to have_css ".leaflet-overlay-pane svg"
-    within "#map" do
+    within "#leaflet-viewer" do
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{default_color}']"
-      find("svg g path:nth-child(2)").click
+      find("svg g path:nth-child(2)").click(x: 1, y: 1)
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{selected_color}']"
-      first("svg g path").click
+      first("svg g path").click(x: 1, y: 1)
       expect(page).to have_css "svg g path:nth-child(2)[fill='#{default_color}']"
     end
   end

data/spec/features/{split_view.html.erb_spec.rb → index_view_spec.rb}

@@ -12,7 +12,7 @@ feature "Index view", js: true do
     visit search_catalog_path(f: {Settings.FIELDS.PROVIDER => ["Stanford"]})
     expect(page).to have_css("#documents")
     expect(page).to have_css(".document", count: 6)
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
 
   scenario "should have sort and per_page on page" do
@@ -22,6 +22,8 @@ feature "Index view", js: true do
   end
 
   scenario "should have facets listed correctly" do
+    skip "Takes too long in CI" if ENV["CI"]
+
     within "#facet-panel-collapse" do
       expect(page).to have_css("div.card.facet-limit", text: "Year")
       expect(page).to have_css("div.card.facet-limit", text: "Place")
@@ -36,13 +38,13 @@ feature "Index view", js: true do
       expect(page).to have_css("div.card.facet-limit", text: "Provider")
       expect(page).to have_css("div.card.facet-limit", text: "Georeferenced")
     end
+
     click_button "Provider"
-    using_wait_time 120 do
-      expect(page).to have_css("a.facet-select", text: "University of Minnesota", visible: true)
-      expect(page).to have_css("a.facet-select", text: "MIT", visible: true)
-      expect(page).to have_css("a.facet-select", text: "Stanford", visible: true)
-      expect(page).to have_css(".more_facets a", text: /more\sProvider\s»/, visible: true)
-    end
+
+    expect(page).to have_css("a.facet-select", text: "University of Minnesota", visible: true)
+    expect(page).to have_css("a.facet-select", text: "MIT", visible: true)
+    expect(page).to have_css("a.facet-select", text: "Stanford", visible: true)
+    expect(page).to have_css(".more_facets a", text: /more\sProvider\s»/, visible: true)
   end
 
   scenario "hover on record should produce bounding box on map" do
@@ -51,28 +53,28 @@ feature "Index view", js: true do
     # BL7 has svg icons, so sniffing for SVG path won't return false
     # expect(Nokogiri::HTML.parse(page.body).css('path').length).to eq 0
     find(".documentHeader", match: :first).hover
-    within("#map") do
+    within("#leaflet-viewer") do
       expect(page).to have_css("path")
     end
   end
 
   scenario "click on a record area to expand collapse" do
     within("article", match: :first) do
-      expect(page).not_to have_css(".collapse")
+      expect(page).to have_css(".collapsed")
       find("button").click
-      expect(page).to have_css(".collapse", visible: true)
+      expect(page).not_to have_css(".collapsed")
     end
   end
 
   scenario "spatial search should reset to page one" do
     visit "/?per_page=5&q=%2A&page=2"
-    find("#map").double_click
+    find("#leaflet-viewer").double_click
     expect(find(".page-entries")).to have_content(/^1 - \d of \d.*$/)
   end
 
   scenario "clicking map search should retain current search parameters" do
     visit "/?f[#{subject_field}][]=Population"
-    find("#map").double_click
+    find("#leaflet-viewer").double_click
     within "#appliedParams" do
       expect(page).to have_content("Subject Population")
       expect(page).to have_css "span.filter-name", text: "Bounding Box"
@@ -83,7 +85,7 @@ feature "Index view", js: true do
     visit search_catalog_path(f: {Settings.FIELDS.PROVIDER => ["Stanford"]})
     within(".documentHeader", match: :first) do
       expect(page).to have_css("a[itemprop='name']")
-      find(".caret-toggle").click
+      find(".dropdown-toggle").click
     end
     within(".more-info-area", match: :first) do
       expect(page).to have_css("small[itemprop='description']")

data/spec/features/layer_inspection_spec.rb

@@ -4,9 +4,9 @@ require "spec_helper"
 
 feature "Layer inspection", js: true do
   scenario "clicking map should trigger inspection" do
-    visit solr_document_path("nyu-2451-34564")
+    visit solr_document_path("tufts-cambridgegrid100-04")
     expect(page).to have_css("th", text: "Attribute")
-    find("#map").click
+    find("#leaflet-viewer").click
     expect(page).not_to have_css("td.default-text")
   end
 end

data/spec/features/layer_preview_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 feature "Layer preview", js: true do
   scenario "Restricted layer should show bounding box" do
     visit solr_document_path("stanford-cg357zz0321")
-    within("#map") do
+    within("#leaflet-viewer") do
       expect(page).to have_css("path")
     end
   end

data/spec/features/missing_metadata_spec.rb

@@ -5,22 +5,22 @@ require "spec_helper"
 feature "Missing metadata", js: true do
   scenario "Yields error free results page for no spatial" do
     visit search_catalog_path(q: "ASTER Global Emissivity")
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
   scenario "Yields error free show page for no wxs_identifier or spatial" do
     visit solr_document_path("aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20")
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
   scenario "Yields error free show page for no layer_geom_type_s" do
     visit solr_document_path("05d-03-noGeomType")
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
   scenario "Yields error free show page for no dct_provider_s" do
     visit solr_document_path("99-0001-noprovider")
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
   scenario "Yields error free show page for no locn_geometry" do
     visit solr_document_path("05d-p16022coll246-noGeo")
-    expect(page).to have_css("#map")
+    expect(page).to have_css("#leaflet-viewer")
   end
 end

data/spec/features/oembed_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 feature "Oembed layer" do
   scenario "Should show oembed content and map" do
     visit solr_document_path("stanford-dc482zx1528")
-    expect(page).to have_css "#map"
-    expect(page).to have_css '[data-protocol="Oembed"]'
+    expect(page).to have_css "#oembed-viewer"
+    expect(page).to have_css '[data-controller="oembed-viewer"]'
   end
 end

data/spec/features/saved_searches_spec.rb

@@ -5,10 +5,13 @@ require "spec_helper"
 feature "saved searches" do
   scenario "list spatial search", js: true do
     visit root_path
-    within "#map" do
+    within "#leaflet-viewer" do
       find(".search-control a").click
       expect(page.current_url).to match(/bbox=/)
     end
+    if Rails.version == "6.1.7.6"
+      visit root_path({bbox: "-180 -89.338214 180 88.918831"})
+    end
     visit blacklight.search_history_path
     expect(page).to have_css "td.query a", text: /#{I18n.t("geoblacklight.bbox_label")}/
   end

data/spec/features/search_results_complex_geometry_spec.rb

@@ -9,7 +9,7 @@ feature "spatial search results with an WKT bounding box that crosses the anti-m
       q: "A new & accurate map of Asia",
       bbox: "98.4375 31.765537 117.202148 45.429299"
     )
-    result_id = page.all("div.documentHeader.row").first["data-layer-id"]
+    result_id = page.all("div.documentHeader").first["data-layer-id"]
     expect(result_id).to eq "57f0f116-b64e-4773-8684-96ba09afb549"
   end
 
@@ -19,7 +19,7 @@ feature "spatial search results with an WKT bounding box that crosses the anti-m
       q: "A new & accurate map of Asia",
       bbox: "-98.717651 34.40691 -96.37207 36.199958"
     )
-    results = page.all("div.documentHeader.row")
+    results = page.all("div.documentHeader")
     expect(results.count).to eq 0
   end
 end

data/spec/features/search_results_icons_spec.rb

@@ -10,8 +10,8 @@ feature "search results display document iconography" do
       q: "stanford-cg357zz0321"
     )
     first_result = page.all("span.status-icons > span")
-    expect(first_result[0][:class]).to include "blacklight-icon-dataset"
-    expect(first_result[1][:class]).to include "blacklight-icon-stanford"
-    expect(first_result[2][:class]).to include "blacklight-icon-restricted"
+    expect(first_result[0][:class]).to include "blacklight-icons-line"
+    expect(first_result[1][:class]).to include "blacklight-icons-stanford"
+    expect(first_result[2][:class]).to include "blacklight-icons-restricted"
   end
 end

data/spec/features/search_results_map_spec.rb

@@ -3,29 +3,12 @@
 require "spec_helper"
 
 feature "search results map", js: true do
-  scenario "present on a search result page" do
-    visit search_catalog_path(q: "Minnesota")
-    expect(page).to have_css "#map"
-  end
-  xscenario "view is scoped to Minnesota" do
-    # pending 'Minnesota fixtures have changed.'
-    visit root_path
-    click_link "Minnesota, United States"
-    expect(page).to have_css "#map"
-    bbox = page.find("#map")["data-js-map-render-bbox"]
-
-    # Example bbox for Place > Minnesota, United States:
-    # "-101.90917968749999,38.75408327579141,-83.27636718749999,53.27835301753182"
-    left, bottom, right, top = bbox.split(",")
-    expect(left.to_f).to be_within(2).of(-101)
-    expect(bottom.to_f).to be_within(3).of(38)
-    expect(right.to_f).to be_within(2).of(-83)
-    expect(top.to_f).to be_within(2).of(53)
-  end
   scenario "view is scoped to Twin Cities metro area" do
     visit search_catalog_path(q: "Minneapolis")
-    expect(page).to have_css "#map"
-    bbox = page.find("#map")["data-js-map-render-bbox"]
+    expect(page).to have_css "#leaflet-viewer"
+    sleep 1
+
+    bbox = page.find("#leaflet-viewer")["data-bounds"]
 
     # Example bbox for q: Minneapolis
     # "-94.537353515625,44.004669106432225,-92.208251953125,45.87088761346192"
@@ -35,19 +18,4 @@ feature "search results map", js: true do
     expect(right.to_f).to be_within(1).of(-92)
     expect(top.to_f).to be_within(1).of(45)
   end
-  scenario "view is scoped to NYC" do
-    skip "spec inconsistently failing"
-    visit root_path
-    click_link "New York, New York"
-    expect(page).to have_css "#map"
-    bbox = page.find("#map")["data-js-map-render-bbox"]
-
-    # Example bbox for Place > New York, New York, United States
-    # "-74.26895141601562,40.455307212131494,-73.68667602539061,40.95501133048621"
-    left, bottom, right, top = bbox.split(",")
-    expect(left.to_f).to be_within(2).of(-74)
-    expect(bottom.to_f).to be_within(2).of(40)
-    expect(right.to_f).to be_within(2).of(-73)
-    expect(top.to_f).to be_within(2).of(40)
-  end
 end

data/spec/features/search_results_overlap_ratio_spec.rb

@@ -50,7 +50,7 @@ end
 
 def position_in_result_page(page, id)
   results = []
-  page.all("div.documentHeader.row").each do |div|
+  page.all("div.documentHeader").each do |div|
     results << div["data-layer-id"]
   end
   results.index(id) + 1

data/spec/features/show_page_download_spec.rb

@@ -19,12 +19,4 @@ feature "Download display on show page" do
       expect(page).to have_selector(:css, 'a[href="https://libimages1.princeton.edu/loris/figgy_prod/2e%2Fa9%2F43%2F2ea943b0bd4348fc9954b299f1b359f6%2Fintermediate_file.jp2/full/full/0/default.jpg"]')
     end
   end
-
-  scenario "with Harvard hgl_download" do
-    visit solr_document_path "harvard-g7064-s2-1834-k3"
-    find("#downloads-button").click
-    within "#downloads-collapse" do
-      expect(page).to have_selector(:css, 'a[href="/download/hgl/harvard-g7064-s2-1834-k3"][data-download-type="harvard-hgl"]')
-    end
-  end
 end

data/spec/features/tilejson_spec.rb

@@ -19,7 +19,7 @@ feature "tilejson layer" do
     visit solr_document_path("princeton-fk4544658v-tilejson")
 
     expect(page).to have_css ".leaflet-control-zoom", visible: :visible
-    expect(page).to have_css "div[data-protocol='Tilejson']"
-    expect(page).to have_css "div[data-url='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json']"
+    expect(page).to have_css "div[data-leaflet-viewer-protocol-value='Tilejson']"
+    expect(page).to have_css "div[data-leaflet-viewer-url-value='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json']"
   end
 end