blacklight-maps 0.5.2 → 1.1.0

data/spec/helpers/blacklight_maps_helper_spec.rb

@@ -1,170 +1,122 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlacklightMapsHelper do
-
+  let(:query_term) { 'Tibet' }
+  let(:mock_controller) { CatalogController.new }
   let(:blacklight_config) { Blacklight::Configuration.new }
-  let(:search_state) { Blacklight::SearchState.new({}, blacklight_config) }
-
-  def create_response
-    raw_response = eval(mock_query_response)
-    Blacklight::Solr::Response.new(raw_response, raw_response['params'])
+  let(:maps_config) { blacklight_config.view.maps }
+  let(:search_service) do
+    Blacklight::SearchService.new(config: blacklight_config, user_params: { q: query_term })
   end
-
-  let(:r) { create_response }
-  let(:geojson_hash) { { type: 'Feature', geometry: { type: 'Point', coordinates: [91.117212, 29.646923] }, properties: { placename: 'Tibet' } } }
+  let(:response) { search_service.search_results[0] }
+  let(:docs) { response.aggregations[maps_config.geojson_field].items }
   let(:coords) { [91.117212, 29.646923] }
+  let(:geojson_hash) do
+    { type: 'Feature', geometry: { type: 'Point', coordinates: coords }, properties: { placename: query_term } }
+  end
   let(:bbox) { [78.3955448, 26.8548157, 99.116241, 36.4833345] }
 
-  before :each do
+  before do
+    mock_controller.request = ActionDispatch::TestRequest.create
+    allow(helper).to receive_messages(controller: mock_controller, action_name: 'index')
     allow(helper).to receive_messages(blacklight_config: blacklight_config)
-    CatalogController.blacklight_config = Blacklight::Configuration.new
-    @request = ActionDispatch::TestRequest.new
-    @catalog = CatalogController.new
-    allow(helper).to receive_messages(blacklight_configuration_context: Blacklight::Configuration::Context.new(@catalog))
-    allow(helper).to receive(:search_state).and_return(search_state)
-    @catalog.request = @request
-    @catalog.action_name = "index"
-    helper.instance_variable_set(:@_controller, @catalog)
-    @docs = r.aggregations[blacklight_config.view.maps.geojson_field].items
+    allow(helper).to receive_messages(blacklight_configuration_context: Blacklight::Configuration::Context.new(mock_controller))
+    allow(helper).to receive(:search_state).and_return Blacklight::SearchState.new({}, blacklight_config, mock_controller)
+    blacklight_config.add_facet_field 'geojson_ssim', limit: -2, label: 'GeoJSON', show: false
+    blacklight_config.add_facet_fields_to_solr_request!
   end
 
-  describe "blacklight_map_tag" do
-
-    context "with default values" do
+  describe 'blacklight_map_tag' do
+    context 'with default values' do
       subject { helper.blacklight_map_tag('blacklight-map') }
-      it { should have_selector "div#blacklight-map" }
-      it { should have_selector "div[data-maxzoom='#{blacklight_config.view.maps.maxzoom}']" }
-      it { should have_selector "div[data-tileurl='#{blacklight_config.view.maps.tileurl}']" }
-      it { should have_selector "div[data-mapattribution='#{blacklight_config.view.maps.mapattribution}']" }
+
+      it { is_expected.to have_selector 'div#blacklight-map' }
+      it { is_expected.to have_selector "div[data-maxzoom='#{maps_config.maxzoom}']" }
+      it { is_expected.to have_selector "div[data-tileurl='#{maps_config.tileurl}']" }
+      it { is_expected.to have_selector "div[data-mapattribution='#{maps_config.mapattribution}']" }
     end
 
-    context "with custom values" do
-     subject { helper.blacklight_map_tag('blacklight-map', data: {maxzoom: 6, tileurl: 'http://example.com/', mapattribution: 'hello world' }) }
-     it { should have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/'][data-mapattribution='hello world']" }
+    context 'with custom values' do
+      subject { helper.blacklight_map_tag('blacklight-map', data: { maxzoom: 6, tileurl: 'http://example.com/', mapattribution: 'hello world' }) }
+
+      it { is_expected.to have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/'][data-mapattribution='hello world']" }
     end
 
-    context "when a block is provided" do
+    context 'when a block is provided' do
       subject { helper.blacklight_map_tag('foo') { content_tag(:span, 'bar') } }
-      it { should have_selector('div > span', text: 'bar') }
-    end
 
+      it { is_expected.to have_selector('div > span', text: 'bar') }
+    end
   end
 
-  describe "serialize_geojson" do
-
-    it "should return geojson of documents" do
-      expect(helper.serialize_geojson(@docs)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
+  describe 'serialize_geojson' do
+    it 'returns geojson of documents' do
+      expect(helper.serialize_geojson(docs)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
     end
-
   end
 
-  describe "placename_value" do
-
-    it "should return the placename value" do
-      expect(helper.placename_value(geojson_hash)).to eq('Tibet')
+  describe 'placename_value' do
+    it 'returns the placename value' do
+      expect(helper.placename_value(geojson_hash)).to eq(query_term)
     end
-
   end
 
-  describe "link_to_bbox_search" do
-
-    it "should create a spatial search link" do
+  describe 'link_to_bbox_search' do
+    it 'creates a spatial search link' do
       expect(helper.link_to_bbox_search(bbox)).to include('catalog?coordinates')
       expect(helper.link_to_bbox_search(bbox)).to include('spatial_search_type=bbox')
     end
 
-    it "should include the default_document_index_view_type in the params" do
+    it 'includes the default_document_index_view_type in the params' do
       expect(helper.link_to_bbox_search(bbox)).to include('view=list')
     end
-
   end
 
-  describe "link_to_placename_field" do
+  describe 'link_to_placename_field' do
+    subject { helper.link_to_placename_field(query_term, maps_config.placename_field) }
 
-    it "should create a link to the placename field" do
-      expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field)).to include("catalog?f%5B#{blacklight_config.view.maps.placename_field}%5D%5B%5D=Tibet")
-    end
+    it { is_expected.to include("catalog?f%5B#{maps_config.placename_field}%5D%5B%5D=Tibet") }
+    it { is_expected.to include('view=list') }
 
-    it "should create a link to the placename field using the display value" do
-      expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field, 'foo')).to include('">foo</a>')
+    it 'creates a link to the placename field using the display value' do
+      expect(helper.link_to_placename_field(query_term, maps_config.placename_field, 'foo')).to include('">foo</a>')
     end
-
-    it "should include the default_document_index_view_type in the params" do
-      expect(helper.link_to_placename_field('Tibet', blacklight_config.view.maps.placename_field)).to include('view=list')
-    end
-
   end
 
-  describe "link_to_point_search" do
-
-    it "should create a link to a coordinate point" do
+  describe 'link_to_point_search' do
+    it 'creates a link to a coordinate point' do
       expect(helper.link_to_point_search(coords)).to include('catalog?coordinates')
       expect(helper.link_to_point_search(coords)).to include('spatial_search_type=point')
     end
 
-    it "should include the default_document_index_view_type in the params" do
+    it 'includes the default_document_index_view_type in the params' do
       expect(helper.link_to_point_search(coords)).to include('view=list')
     end
-
-  end
-
-  describe "map_facet_field" do
-
-    it "should return the correct facet field" do
-      expect(helper.map_facet_field).to eq(blacklight_config.view.maps.geojson_field)
-    end
-
-  end
-
-  describe "map_facet_values" do
-
-    before do
-      @response = r
-    end
-
-    it "should return an array of Blacklight::Solr::Response::Facets::FacetItem items" do
-      expect(helper.map_facet_values.class).to eq(Array)
-      expect(helper.map_facet_values.first.class).to eq(Blacklight::Solr::Response::Facets::FacetItem)
-      expect(helper.map_facet_values.length).to eq(5)
-    end
-
   end
 
-  describe "render_placename_heading" do
-
-    it "should return the placename heading" do
-      expect(helper.render_placename_heading(geojson_hash)).to eq('Tibet')
+  describe 'render_placename_heading' do
+    it 'returns the placename heading' do
+      expect(helper.render_placename_heading(geojson_hash)).to eq(query_term)
     end
-
   end
 
-  describe "render_index_mapview" do
+  describe 'render_index_mapview' do
+    before { helper.instance_variable_set(:@response, response) }
 
-    before do
-      @response = r
-    end
-
-    it "should render the 'catalog/index_mapview' partial" do
+    it 'renders the "catalog/index_mapview" partial' do
       expect(helper.render_index_mapview).to include("$('#blacklight-index-map').blacklight_leaflet_map")
     end
-
   end
 
-  describe "render_spatial_search_link" do
-
-    it "should return link_to_bbox_search if bbox coordinates are passed" do
+  describe 'render_spatial_search_link' do
+    it 'returns link_to_bbox_search if bbox coordinates are passed' do
       expect(helper.render_spatial_search_link(bbox)).to include('spatial_search_type=bbox')
     end
 
-    it "should return link_to_point_search if point coordinates are passed" do
+    it 'returns link_to_point_search if point coordinates are passed' do
       expect(helper.render_spatial_search_link(coords)).to include('spatial_search_type=point')
     end
-
   end
-
-  def mock_query_response
-    %({"responseHeader"=>{"status"=>0, "QTime"=>14, "params"=>{"q"=>"tibet", "spellcheck.q"=>"tibet", "qt"=>"search", "wt"=>"ruby", "rows"=>"10"}}, "response"=>{"numFound"=>2, "start"=>0, "maxScore"=>0.016135123, "docs"=>[{"published_display"=>["Dharamsala, H.P."], "author_display"=>"Thub-bstan-yar-ʼphel, Rnam-grwa", "lc_callnum_display"=>["DS785 .T475 2005"], "pub_date"=>["2005"], "format"=>"Book", "material_type_display"=>["a-e, iv, ii, 407 p."], "title_display"=>"Bod gaṅs can gyi rgyal rabs mdor bsdus dris lan brgya pa rab gsal śel gyi me loṅ źes bya ba bźugs so", "id"=>"2008308202", "subject_geo_facet"=>["Tibet"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}"], "coordinates"=>["91.117212 29.646923", "78.3955448 26.8548157 99.116241 36.4833345"], "score"=>0.016135123}, {"published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "subject_geo_facet"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212,29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}","{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "78.96288 20.593684"], "score"=>0.0026767207}]}, "facet_counts"=>{"facet_queries"=>{}, "facet_fields"=>{"format"=>["Book", 2], "lc_1letter_facet"=>["D - World History", 1], "lc_alpha_facet"=>["DS", 1], "lc_b4cutter_facet"=>["DS785", 1], "language_facet"=>["Tibetan", 2], "pub_date"=>["2005", 1, "2007", 1], "subject_era_facet"=>[], "subject_geo_facet"=>["China", 1, "India", 1, "Tibet", 1, "Tibet (China)", 1], "coordinates"=>["91.117212 29.646923", 2, "78.3955448 26.8548157 99.116241 36.4833345", 1, "68.162386 6.7535159 97.395555 35.5044752", 1, "104.195397 35.86166", 1, "78.96288 20.593684", 1], "geojson"=>["{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[91.117212, 29.646923]},\\"properties\\":{\\"placename\\":\\"Tibet\\"}}", 2, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[78.3955448, 26.8548157], [99.116241, 26.8548157], [99.116241, 36.4833345], [78.3955448, 36.4833345], [78.3955448, 26.8548157]]]},\\"bbox\\":[78.3955448,26.8548157,99.116241,36.4833345]}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[104.195397,35.86166]},\\"properties\\":{\\"placename\\":\\"China\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Point\\",\\"coordinates\\":[78.96288,20.593684]},\\"properties\\":{\\"placename\\":\\"India\\"}}", 1, "{\\"type\\":\\"Feature\\",\\"geometry\\":{\\"type\\":\\"Polygon\\",\\"coordinates\\":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},\\"bbox\\":[68.162386,6.7535159,97.395555,35.5044752]}", 1], "subject_topic_facet"=>["Education and state", 1, "Teaching", 1, "Tibetan language", 1, "Tibetans", 1]}, "facet_dates"=>{}, "facet_ranges"=>{}}, "spellcheck"=>{"suggestions"=>["tibet", {"numFound"=>1, "startOffset"=>0, "endOffset"=>5, "origFreq"=>2, "suggestion"=>[{"word"=>"tibetan", "freq"=>6}]}, "correctlySpelled", true]}})
-  end
-
 end

data/spec/lib/blacklight/maps/export_spec.rb

@@ -1,228 +1,194 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "BlacklightMaps::GeojsonExport" do
+require 'spec_helper'
 
-  before do
-    CatalogController.blacklight_config = Blacklight::Configuration.new
-    @controller = CatalogController.new
-    @action = "index"
-    @request = ActionDispatch::TestRequest.new
-    @controller.request = @request
-    @response = ActionDispatch::TestResponse.new
-    expect(@response).to receive(:docs).and_return([{ "published_display"=>["Dharamsala, Distt. Kangra, H.P."], "pub_date"=>["2007"], "format"=>"Book", "title_display"=>"Ses yon", "material_type_display"=>["xii, 419 p."], "id"=>"2008308478", "placename_field"=>["China", "Tibet", "India"], "subject_topic_facet"=>["Education and state", "Tibetans", "Tibetan language", "Teaching"], "language_facet"=>["Tibetan"], "geojson"=>["{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[104.195397,35.86166]},\"properties\":{\"placename\":\"China\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[91.117212,29.646923]},\"properties\":{\"placename\":\"Tibet\"}}", "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[78.96288,20.593684]},\"properties\":{\"placename\":\"India\"}}"], "coordinates"=>["68.162386 6.7535159 97.395555 35.5044752", "104.195397 35.86166", "91.117212 29.646923", "20.593684,78.96288"], "score"=>0.0026767207 }])
+describe BlacklightMaps::GeojsonExport do
+  let(:controller) { CatalogController.new }
+  let(:action) { :index }
+  let(:response_docs) do
+    YAML.safe_load(File.open(File.join(fixture_path, 'sample_solr_documents.yml')))
   end
+  let(:export) { described_class.new(controller, action, response_docs, foo: 'bar') }
 
-  # TODO: use @response.facet_by_field_name('geojson').items instead of @response
-  #       then refactor build_geojson_features and to_geojson specs
-  subject {BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs, {foo:'bar'})}
+  before { controller.request = ActionDispatch::TestRequest.create }
 
-  it "should instantiate GeojsonExport" do
-    expect(subject.class).to eq(::BlacklightMaps::GeojsonExport)
+  it 'instantiates a GeojsonExport instance' do
+    expect(export.class).to eq(::BlacklightMaps::GeojsonExport)
   end
 
-  describe "return config settings" do
-
-    it "should return maps config" do
-      expect(subject.send(:blacklight_maps_config).class).to eq(::Blacklight::Configuration::ViewConfig)
-    end
-
-    it "should return geojson_field" do
-      expect(subject.send(:geojson_field)).to eq('geojson')
-    end
-
-    it "should return coordinates_field" do
-      expect(subject.send(:coordinates_field)).to eq('coordinates')
-    end
-
-    it "should return search_mode" do
-      expect(subject.send(:search_mode)).to eq('placename')
+  describe 'return config settings' do
+    it 'returns maps config' do
+      expect(export.send(:maps_config).class).to eq(::Blacklight::Configuration::ViewConfig)
     end
 
-    it "should return facet_mode" do
-      expect(subject.send(:facet_mode)).to eq('geojson')
+    it 'returns geojson_field' do
+      expect(export.send(:geojson_field)).to eq('geojson_ssim')
     end
 
-    it "should return placename_property" do
-      expect(subject.send(:placename_property)).to eq('placename')
+    it 'returns coordinates_field' do
+      expect(export.send(:coordinates_field)).to eq('coordinates_srpt')
     end
 
-    it "should create an @options instance variable" do
-      expect(subject.instance_variable_get("@options")[:foo]).to eq('bar')
+    it 'creates an @options instance variable' do
+      expect(export.instance_variable_get('@options')[:foo]).to eq('bar')
     end
-
   end
 
-  describe "build_feature_from_geojson" do
-
-    describe "point feature" do
-
-      before do
-        @output = subject.send(:build_feature_from_geojson, '{"type":"Feature","geometry":{"type":"Point","coordinates":[104.195397,35.86166]},"properties":{"placename":"China"}}', 1)
-      end
+  describe 'build_feature_from_geojson' do
+    describe 'point feature' do
+      let(:geojson) { '{"type":"Feature","geometry":{"type":"Point","coordinates":[104.195397,35.86166]},"properties":{"placename":"China"}}' }
+      let(:point_feature) { export.send(:build_feature_from_geojson, geojson, 1) }
 
-      it "should have a hits property with the right value" do
-        expect(@output[:properties]).to have_key(:hits)
-        expect(@output[:properties][:hits]).to eq(1)
+      it 'has a hits property with the right value' do
+        expect(point_feature[:properties][:hits]).to eq(1)
       end
 
-      it "should have a popup property" do
-        expect(@output[:properties]).to have_key(:popup)
+      it 'has a popup property' do
+        expect(point_feature[:properties]).to have_key(:popup)
       end
-
     end
 
-    describe "bbox feature" do
-
-      describe "catalog#index view" do
-
-        before do
-          @output = subject.send(:build_feature_from_geojson, '{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},"bbox":[68.162386, 6.7535159, 97.395555, 35.5044752]}', 1)
-        end
+    describe 'bbox feature' do
+      describe 'catalog#index view' do
+        let(:geojson) { '{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]},"bbox":[68.162386, 6.7535159, 97.395555, 35.5044752]}' }
+        let(:bbox_feature) { export.send(:build_feature_from_geojson, geojson, 1) }
 
-        it "should set the center point as the coordinates" do
-          expect(@output[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
+        it 'sets the center point as the coordinates' do
+          expect(bbox_feature[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
         end
 
-        it "should change the geometry type to 'Point'" do
-          expect(@output[:geometry][:type]).to eq("Point")
-          expect(@output[:bbox]).to be_nil
+        it "changes the geometry type to 'Point'" do
+          expect(bbox_feature[:geometry][:type]).to eq('Point')
+          expect(bbox_feature[:bbox]).to be_nil
         end
-
       end
-
     end
-
   end
 
-  describe "build_feature_from_coords" do
-
-    describe "point feature" do
-
-      before do
-        @output = subject.send(:build_feature_from_coords, '35.86166,104.195397', 1)
-      end
+  describe 'build_feature_from_coords' do
+    describe 'point feature' do
+      let(:point_feature) { export.send(:build_feature_from_coords, '35.86166,104.195397', 1) }
 
-      it "should create a GeoJSON feature hash" do
-        expect(@output.class).to eq(Hash)
-        expect(@output[:type]).to eq("Feature")
+      it 'creates a GeoJSON feature hash' do
+        expect(point_feature.class).to eq(Hash)
+        expect(point_feature[:type]).to eq('Feature')
       end
 
-      it "should have the right coordinates" do
-        expect(@output[:geometry][:coordinates]).to eq([104.195397, 35.86166])
+      it 'has the right coordinates' do
+        expect(point_feature[:geometry][:coordinates]).to eq([104.195397, 35.86166])
       end
 
-      it "should have a hits property with the right value" do
-        expect(@output[:properties]).to have_key(:hits)
-        expect(@output[:properties][:hits]).to eq(1)
+      it 'has a hits property with the right value' do
+        expect(point_feature[:properties][:hits]).to eq(1)
       end
 
-      it "should have a popup property" do
-        expect(@output[:properties]).to have_key(:popup)
+      it 'has a popup property' do
+        expect(point_feature[:properties]).to have_key(:popup)
       end
-
     end
 
-    describe "bbox feature" do
-
-      describe "catalog#index view" do
+    describe 'bbox feature' do
+      let(:basic_bbox) { 'ENVELOPE(68.162386, 97.395555, 35.5044752, 6.7535159)' }
 
-        before do
-          @output = subject.send(:build_feature_from_coords, '68.162386 6.7535159 97.395555 35.5044752', 1)
-        end
+      describe 'catalog#index view' do
+        let(:bbox_feature) { export.send(:build_feature_from_coords, basic_bbox, 1) }
 
-        it "should set the center point as the coordinates" do
-          expect(@output[:geometry][:type]).to eq("Point")
-          expect(@output[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
+        it 'sets the center point as the coordinates' do
+          expect(bbox_feature[:geometry][:type]).to eq('Point')
+          expect(bbox_feature[:geometry][:coordinates]).to eq([82.7789705, 21.12899555])
         end
 
-        describe "bounding box that crosses the dateline" do
-
-          before do
-            @output = subject.send(:build_feature_from_coords, '1.162386 6.7535159 -179.395555 35.5044752', 1)
+        describe 'bounding box that crosses the dateline' do
+          let(:bbox_feature) do
+            export.send(:build_feature_from_coords,
+                        'ENVELOPE(1.162386, -179.395555, 35.5044752, 6.7535159)', 1)
           end
 
-          it "should set a center point with a long value between -180 and 180" do
-            expect(@output[:geometry][:coordinates]).to eq([90.88341550000001,21.12899555])
+          it 'sets a center point with a long value between -180 and 180' do
+            expect(bbox_feature[:geometry][:coordinates]).to eq([90.88341550000001, 21.12899555])
           end
-
         end
-
       end
 
-      describe "catalog#show view" do
-
-        before do
-          @action = "show"
-          @output = subject.send(:build_feature_from_coords, '68.162386 6.7535159 97.395555 35.5044752', 1)
-        end
+      describe 'catalog#show view' do
+        let(:action) { :show }
+        let(:show_feature) { export.send(:build_feature_from_coords, basic_bbox, 1) }
 
-        it "should convert the bbox string to a polygon coordinate array" do
-          expect(@output[:geometry][:type]).to eq("Polygon")
-          expect(@output[:geometry][:coordinates]).to eq([[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]])
+        it 'converts the bbox string to a polygon coordinate array' do
+          expect(show_feature[:geometry][:type]).to eq('Polygon')
+          expect(show_feature[:geometry][:coordinates]).to eq(
+            [[[68.162386, 6.7535159], [97.395555, 6.7535159], [97.395555, 35.5044752], [68.162386, 35.5044752], [68.162386, 6.7535159]]]
+          )
         end
 
-        it "should set the bbox member" do
-          expect(@output[:bbox]).to eq([68.162386, 6.7535159, 97.395555, 35.5044752])
+        it 'sets the bbox member' do
+          expect(show_feature[:bbox]).to eq([68.162386, 6.7535159, 97.395555, 35.5044752])
         end
-
       end
-
     end
-
   end
 
-  describe "render_leaflet_popup_content" do
-
-    describe "placename_facet search_mode" do
-
-      it "should render the map_placename_search partial if the placename is present" do
-        expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{placename:"China", hits:1}})).to include('href="/catalog?f%5Bplacename_field%5D%5B%5D=China')
+  describe 'render_leaflet_popup_content' do
+    describe 'placename_facet search_mode' do
+      let(:placename_popup) do
+        export.send(:render_leaflet_popup_content,
+                    { type: 'Feature',
+                      geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+                      properties: { placename: 'China', hits: 1 } })
+      end
+      let(:spatial_popup) do
+        export.send(:render_leaflet_popup_content,
+                    { type: 'Feature',
+                      geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+                      properties: { hits: 1 } })
       end
 
-      it "should render the map_spatial_search partial if the placename is not present" do
-        expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{hits:1}})).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+      it 'renders the map_placename_search partial if the placename is present' do
+        expect(placename_popup).to include('href="/catalog?f%5Bsubject_geo_ssim%5D%5B%5D=China')
       end
 
+      it 'renders the map_spatial_search partial if the placename is not present' do
+        expect(spatial_popup).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+      end
     end
 
-    describe "coordinates search_mode" do
-
+    describe 'coordinates search_mode' do
       before do
         CatalogController.configure_blacklight do |config|
           config.view.maps.search_mode = 'coordinates'
         end
       end
 
-      it "should render the map_spatial_search partial" do
-        expect(subject.send(:render_leaflet_popup_content, {type:"Feature",geometry:{type:"Point",coordinates:[104.195397,35.86166]},properties:{hits:1}})).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+      let(:spatial_popup) do
+        export.send(:render_leaflet_popup_content,
+                    { type: 'Feature',
+                      geometry: { type: 'Point', coordinates: [104.195397, 35.86166] },
+                      properties: { hits: 1 } })
       end
 
+      it 'renders the map_spatial_search partial' do
+        expect(spatial_popup).to include('href="/catalog?coordinates=35.86166%2C104.195397&spatial_search_type=point')
+      end
     end
-
   end
 
-  describe "build_geojson_features" do
-
-    before do
-      @action = "show"
+  describe 'build_geojson_features' do
+    let(:geojson_features) do
+      described_class.new(controller, :show, response_docs.first).send(:build_geojson_features)
     end
 
-    it "should create an array of features" do
-      expect(BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs[0]).send(:build_geojson_features).blank?).to be false
+    it 'creates an array of system' do
+      expect(geojson_features).not_to be_blank
     end
-
   end
 
-  describe "to_geojson" do
-
-    before do
-      @action = "show"
+  describe 'to_geojson' do
+    let(:feature_collection) do
+      described_class.new(controller, :show, response_docs.first).send(:to_geojson)
     end
 
-    it "should render feature collection as json" do
-      expect(BlacklightMaps::GeojsonExport.new(@controller, @action, @response.docs[0]).send(:to_geojson)).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
+    it 'renders feature collection as json' do
+      expect(feature_collection).to include('{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point"')
     end
-
   end
-
 end