geoblacklight 2.4.0 → 3.0.0

data/spec/features/layer_with_no_references_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'layer with no wms or iiif' do

data/spec/features/linkified_attribute_table_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Attribute table values', js: true do

data/spec/features/metadata_panel_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Metadata tools' do

data/spec/features/missing_metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Missing metadata', js: true do

data/spec/features/multiple_downloads_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'Multiple downloads' do
+  feature 'when item has multiple downloads in dct_references_s' do
+    scenario 'downloads are listed in download card' do
+      visit solr_document_path 'cugir-007950'
+      within '.card.downloads' do
+        expect(page).to have_link 'Shapefile', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip'
+        expect(page).to have_link 'PDF', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf'
+        expect(page).to have_link 'KMZ', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz'
+      end
+    end
+  end
+end

data/spec/features/oembed_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Oembed layer' do

data/spec/features/relations_spec.rb

@@ -1,52 +1,33 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Display related documents' do
-  let(:expected_json_resp) do
-    {
-      'ancestors' =>
-        {
-          'numFound' => 0,
-          'start' => 0,
-          'docs' => []
-        },
-      'descendants' =>
-            {
-              'numFound' => 1,
-              'start' => 0,
-              'docs' =>
-                    [
-                      {
-                        'dc_title_s' => '2015 New York City Subway Complexes and Ridership',
-                        'layer_slug_s' => 'nyu_2451_34502',
-                        'layer_geom_type_s' => 'Point'
-                      }
-                    ]
-            },
-      'current_doc' => 'nyu_2451_34635'
-    }
-  end
   scenario 'Record with dc_source_sm value(s) should have parent(s)' do
     visit relations_solr_document_path('nyu_2451_34502')
-    expect(page).to have_css('ul b', text: 'Source Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Source Datasets')
   end
 
   scenario 'Record that is pointed to by others should have children' do
     visit relations_solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('ul b', text: 'Derived Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Derived Datasets')
   end
 
   scenario 'Relations should respond to json' do
     visit relations_solr_document_path('nyu_2451_34635', format: 'json')
-    expect(page.body).to eq(expected_json_resp.to_json)
+    response = JSON.parse(page.body)
+    expect(response['ancestors']['numFound']).to eq 0
+    expect(response['descendants']['docs'].first['layer_slug_s']).to eq 'nyu_2451_34502'
+    expect(response['current_doc']).to eq 'nyu_2451_34635'
   end
 
   scenario 'Record with relations should render widget in catalog#show', js: true do
     visit solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('div.card-header', text: 'Data Relations')
+    expect(page).to have_css('.card.relations')
+    expect(page).to have_css('div.card-header', text: 'Derived Datasets')
   end
 
   scenario 'Record without relations should not render widget in catalog#show', js: true do
     visit solr_document_path('harvard-g7064-s2-1834-k3')
-    expect(page).to have_no_css('div.panel-heading', text: 'Data Relations')
+    expect(page).to have_no_css('.card.relations')
   end
 end

data/spec/features/saved_searches_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'saved searches' do

data/spec/features/search_bar_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'search bar' do

data/spec/features/search_results_map_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'search results map', js: true do
@@ -5,12 +6,6 @@ feature 'search results map', js: true do
     visit search_catalog_path(q: 'Minnesota')
     expect(page).to have_css '#map'
   end
-  scenario 'present on a search result page' do
-    visit root_path
-    click_link 'Minnesota, United States'
-    results = page.all(:css, 'article.document')
-    expect(results.count).to equal(3)
-  end
   scenario 'view is scoped to Minnesota' do
     visit root_path
     click_link 'Minnesota, United States'

data/spec/features/search_results_overlap_ratio_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'spatial search results overlap ratio' do
@@ -34,15 +35,15 @@ feature 'spatial search results overlap ratio' do
 
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best
-    expect(position_in_result_page(page, 'cugir-008186')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186')).to be < 4
 
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best (score tie)
-    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 4
 
     # NY Adirondak Region result
     # Smaller bbox / result bbox overlaps bbox param the least
-    expect(position_in_result_page(page, 'cugir-007741')).to eq 3
+    expect(position_in_result_page(page, 'cugir-007741')).to eq 4
   end
 end
 

data/spec/features/search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Search' do

data/spec/features/show_page_metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Metadata display on show page' do

data/spec/features/sms_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'SMS tool', js: true do

data/spec/features/split_view.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Index view', js: true do
@@ -51,7 +52,7 @@ feature 'Index view', js: true do
   end
 
   scenario 'click on a record area to expand collapse' do
-    within('.documentHeader', match: :first) do
+    within('article', match: :first) do
       expect(page).not_to have_css('.collapse')
       find('button').click
       expect(page).to have_css('.collapse', visible: true)

data/spec/features/suppressed_records_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Suppressed records' do

data/spec/features/web_services_modal_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'web services tools' do

data/spec/fixtures/solr_documents/multiple-downloads.json

@@ -0,0 +1,30 @@
+{
+  "geoblacklight_version": "1.0",
+  "dc_identifier_s": "https://cugir.library.cornell.edu/catalog/cugir-007950",
+  "dc_title_s": "Test record with additional download formats",
+  "dc_description_s": "This is a test record containing new-style references as nested child documents.  In addition to the origianl shapefile download, the references section contains additional PDF and KMZ downloads.",
+  "dc_rights_s": "Public",
+  "dct_provenance_s": "Cornell",
+  "dct_references_s": "{\"http:\/\/schema.org\/downloadUrl\":[{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http:\/\/www.opengis.net\/cat\/csw\/csdgm\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.xml\",\"http:\/\/www.w3.org\/1999\/xhtml\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.html\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wfs\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wfs\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wms\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wms\"}",
+  "layer_id_s": "cugir007950",
+  "layer_slug_s": "cugir-007950",
+  "dc_type_s": "Dataset",
+  "dc_format_s": "Shapefile",
+  "layer_geom_type_s": "Polygon",
+  "layer_modified_dt": "2019-05-24T00:00:00Z",
+  "dc_creator_sm": [
+    "Cornell Institute for Resource Information Sciences (Cornell IRIS)",
+    "NYS Department of Agriculture and Markets"
+  ],
+  "dc_subject_sm": [
+    "New York State Agricultural District boundaries",
+    "Agriculture and Markets",
+    "Agricultural Districts Mapping Program"
+  ],
+  "dct_spatial_sm": ["Broome County NY"],
+  "dct_issued_s": "2011-02-28",
+  "dct_temporal_sm": ["2011"],
+  "dct_isPartOf_sm": ["Agricultural Districts (NYS Ag and Markets)"],
+  "solr_geom": "ENVELOPE(-76.12987, -75.42034, 42.414648, 41.997963)",
+  "solr_year_i": 2011
+}

data/spec/helpers/arcgis_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ArcgisHelper, type: :helper do

data/spec/helpers/carto_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CartoHelper, type: :helper do

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GeoblacklightHelper, type: :helper do
@@ -8,7 +9,7 @@ describe GeoblacklightHelper, type: :helper do
     let(:subject_field) { Settings.FIELDS.SUBJECT }
     it 'contains unique links' do
       expect(self).to receive(:search_catalog_path).exactly(3).times.and_return("http://example.com/catalog?f[#{subject_field}][]=category")
-      html = Capybara.string(render_facet_links(subject_field, %w(Test Test Earth Science)))
+      html = Capybara.string(render_facet_links(subject_field, %w[Test Test Earth Science]))
       expect(html).to have_css 'a', count: 3
       expect(html).to have_css 'a', text: 'Test', count: 1
       expect(html).to have_css 'a', text: 'Earth', count: 1
@@ -52,6 +53,17 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
+  describe '#download_link_file' do
+    let(:label) { 'Test Link Text' }
+    let(:id) { 'test-id' }
+    let(:url) { 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip' }
+
+    it 'generates a link to download the original file' do
+      puts download_link_file(label, id, url)
+      expect(download_link_file(label, id, url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" class="btn btn-default download download-original" data-download="trigger" data-download-type="direct" data-download-id="test-id" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
+    end
+  end
+
   describe '#download_link_direct' do
     let(:text) { 'Test Link Text' }
     let(:references_field) { Settings.FIELDS.REFERENCES }
@@ -185,7 +197,7 @@ describe GeoblacklightHelper, type: :helper do
     context 'as a multivalued Array' do
       let(:document_attributes) do
         {
-          value: %w(short description)
+          value: %w[short description]
         }
       end
       it 'uses both values' do
@@ -204,9 +216,9 @@ describe GeoblacklightHelper, type: :helper do
       allow(helper).to receive(:application_name).and_return('GeoBlacklight')
     end
 
-    describe '#cartodb_link' do
+    describe '#carto_link' do
       it 'aliases CartoHelper#carto_link' do
-        expect(helper.cartodb_link('http://demo.org/wfs/layer.json')).to eq(helper.carto_link('http://demo.org/wfs/layer.json'))
+        expect(helper.carto_link('http://demo.org/wfs/layer.json')).to eq(helper.carto_link('http://demo.org/wfs/layer.json'))
       end
     end
   end
@@ -240,7 +252,7 @@ describe GeoblacklightHelper, type: :helper do
 
   describe '#render_value_as_truncate_abstract' do
     context 'with multiple values' do
-      let(:document) { SolrDocument.new(value: %w(short description)) }
+      let(:document) { SolrDocument.new(value: %w[short description]) }
       it 'wraps in correct DIV class' do
         expect(helper.render_value_as_truncate_abstract(document)).to eq '<div class="truncate-abstract">short description</div>'
       end
@@ -328,15 +340,36 @@ describe GeoblacklightHelper, type: :helper do
   end
 
   describe '#relations_icon' do
-    it 'renders a goemetry type if configured' do
-      allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(true)
-      html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
-      expect(html.title.strip).to eq 'Polygon'
-    end
-    it 'renders provided icon if not configured to use geometry' do
-      allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(false)
-      html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
-      expect(html.title.strip).to eq 'Leaf'
+    context 'when configured to use the geometry type' do
+      before do
+        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(true)
+      end
+
+      it 'renders a goemetry type as the icon' do
+        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        expect(html.title.strip).to eq 'Polygon'
+      end
+
+      it 'has the svg_tooltip class so that the Bootstrap tooltip is applied' do
+        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        expect(html).to have_css('.blacklight-icons.svg_tooltip')
+      end
+    end
+
+    context 'when not confiugred to use the geometry type' do
+      before do
+        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(false)
+      end
+
+      it 'renders the provided icon' do
+        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        expect(html.title.strip).to eq 'Leaf'
+      end
+
+      it 'does not have the svg_tooltip class' do
+        html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        expect(html).not_to have_css('.blacklight-icons.svg_tooltip')
+      end
     end
   end
 end

data/spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js

@@ -0,0 +1,12 @@
+//= require geoblacklight
+
+describe('setupInspection', function() {
+  describe('Inspect attribute on the map', function() {
+    it('identifyFeatures is defined', function() {
+      expect(L.esri.identifyFeatures).toBeDefined();
+    });
+    it('Tasks is not defined', function() {
+      expect(L.esri.Tasks).toBeUndefined();
+    });
+  });
+});

data/spec/lib/geoblacklight/bounding_box_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::BoundingBox do

data/spec/lib/geoblacklight/controller_override_spec.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'spec_helper'

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::DocumentPresenter do
   # Please see https://github.com/projectblacklight/blacklight/blob/v6.15.0/spec/presenters/index_presenter_spec.rb#L4
+  subject { presenter }
   let(:request_context) { double(document_index_view_type: 'list') }
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
@@ -12,7 +14,6 @@ describe Geoblacklight::DocumentPresenter do
     end
   end
   let(:solr_fields) { Settings.FIELDS }
-  subject { presenter }
   let(:presenter) do
     described_class.new(document, request_context, blacklight_config)
   end
@@ -23,7 +24,7 @@ describe Geoblacklight::DocumentPresenter do
       layer_id_s: 'druid:abc123',
       non_index_field: 'do not render',
       period: 'Ends with period.',
-      multi_display: %w(blue blah)
+      multi_display: %w[blue blah]
     )
   end
 

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::GeojsonDownload do

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::GeotiffDownload do

data/spec/lib/geoblacklight/download/hgl_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::HglDownload do

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload do

data/spec/lib/geoblacklight/download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Download do
@@ -31,7 +32,7 @@ describe Geoblacklight::Download do
   end
   describe '#file_path' do
     it 'returns the path with name and extension' do
-      expect(download.class.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
+      expect(download.class.file_path).to eq Rails.root.join('tmp', 'cache', 'downloads')
     end
     it 'is configurable' do
       expect(Settings).to receive(:DOWNLOAD_PATH).and_return('configured/path')