Merge 9e62e53 into 606f8f0

geoblacklight · Jul 24, 2018 · dbefd93 · dbefd93
2 parents 606f8f0 + 9e62e53
commit dbefd93
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/lib/geoblacklight/relation/relation_response.rb b/lib/geoblacklight/relation/relation_response.rb
@@ -3,7 +3,7 @@ module Relation
     class RelationResponse
       attr_reader :search_id
       def initialize(id, repository)
-        @search_id = id
+        @search_id = RSolr.solr_escape(id)
         @repository = repository
       end
 

diff --git a/spec/features/home_page_spec.rb b/spec/features/home_page_spec.rb
@@ -14,7 +14,7 @@
   end
   scenario 'find by category' do
     expect(page).to have_css '.category-block', count: 4
-    expect(page).to have_css '.home-facet-link', count: 34
+    expect(page).to have_css '.home-facet-link', count: 35
     expect(page).to have_css 'a.more_facets_link', count: 4
     click_link 'Elevation'
     expect(page).to have_css '.filterName', text: 'Subject'

diff --git a/spec/fixtures/solr_documents/uva_slug_colon.json b/spec/fixtures/solr_documents/uva_slug_colon.json
@@ -0,0 +1,25 @@
+{
+  "dc_description_s": "Police stations for Norfolk, Virginia.",
+  "dc_format_s": "Shapefile",
+  "dc_identifier_s": "315fc8ee-3b57-4ebb-aa24-4300f1c42dc9-13",
+  "dc_language_s": "eng",
+  "dc_rights_s": "Public",
+  "dc_subject_sm": [
+    "Location"
+  ],
+  "dc_title_s": "Norfolk 2005 Police Stations",
+  "dct_issued_s": "2008-10-17",
+  "dct_provenance_s": "UVa",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://gis.lib.virginia.edu/geoserver/wms\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"http://gis.lib.virginia.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://gis.lib.virginia.edu/geoserver/wcs\",\"http://schema.org/downloadUrl\":\"http://gis.lib.virginia.edu/geoserver/ows?service=WFS\\u0026typeName=Norfolk:police_point\\u0026request=GetFeature\\u0026outputFormat=shape-zip\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://opengeometadata.github.io/edu.virginia/382/13/iso19139.xml\"}",
+  "dct_temporal_sm": [
+    "2005-2005"
+  ],
+  "georss_box_s": "36.82 -76.346 36.971 -76.176",
+  "georss_polygon_s": "36.82 -76.346 36.971 -76.346 36.971 -76.176 36.82 -76.176 36.82 -76.346",
+  "layer_geom_type_s": "MultiPoint",
+  "layer_id_s": "Norfolk:police_point",
+  "layer_modified_dt": "2008-11-12T15:29:47Z",
+  "layer_slug_s": "uva-Norfolk:police_point",
+  "solr_geom": "ENVELOPE(-76.346, -76.176, 36.971, 36.82)",
+  "solr_year_i": 2005
+}
diff --git a/spec/lib/geoblacklight/relation/relation_response_spec.rb b/spec/lib/geoblacklight/relation/relation_response_spec.rb
@@ -31,5 +31,13 @@
     it 'returns true if document has neither ancestors nor descendants' do
       expect(empty_relation_resp.empty?).to be true
     end
+
+    context 'with a layer slug containing a colon' do
+      let(:empty_relation_resp) { described_class.new('uva-Norfolk:police_point', repository) }
+
+      it 'returns true if document has neither ancestors nor descendants' do
+        expect(empty_relation_resp.empty?).to be true
+      end
+    end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 ENV['RAILS_ENV'] ||= 'test'
 
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 require 'engine_cart'
 require 'coveralls'