geoblacklight 4.0.0 → 4.1.1

data/spec/controllers/wms_controller_spec.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 describe WmsController, type: :controller do
   let(:wms_layer) { instance_double(Geoblacklight::WmsLayer) }
-  let(:feature_info) { { values: ['fid', 'layer:example'] } }
+  let(:feature_info) { {values: ["fid", "layer:example"]} }
   let(:params) do
-    { 'format' => 'json', 'URL' => 'http://www.example.com/', 'LAYERS' => 'layer:example',
-      'BBOX' => '-74, 40, -68, 43', 'WIDTH' => '500', 'HEIGHT' => '400',
-      'QUERY_LAYERS' => 'layer:example', 'X' => '277', 'Y' => '195' }
+    {"format" => "json", "URL" => "http://www.example.com/", "LAYERS" => "layer:example",
+     "BBOX" => "-74, 40, -68, 43", "WIDTH" => "500", "HEIGHT" => "400",
+     "QUERY_LAYERS" => "layer:example", "X" => "277", "Y" => "195"}
   end
 
   before do
@@ -15,17 +16,17 @@ describe WmsController, type: :controller do
     allow(wms_layer).to receive(:feature_info).and_return(feature_info)
   end
 
-  describe '#handle' do
-    it 'returns feature info as json' do
+  describe "#handle" do
+    it "returns feature info as json" do
       get :handle, params: params
       expect(response.body).to eq(feature_info.to_json)
     end
   end
 
-  describe '#wms_params' do
+  describe "#wms_params" do
     let(:wms_params) { controller.instance_eval { wms_params } }
 
-    it 'returns only permitted params' do
+    it "returns only permitted params" do
       get :handle, params: params
       expect(wms_params.to_h).to eq(params)
     end

data/spec/factories/user.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
-    password { 'password' }
-    password_confirmation { 'password' }
+    password { "password" }
+    password_confirmation { "password" }
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Blacklight Bookmarks' do
-  scenario 'index has created bookmarks' do
-    visit solr_document_path 'nyu-2451-34564'
-    click_button 'Bookmark'
+require "spec_helper"
+
+feature "Blacklight Bookmarks" do
+  scenario "index has created bookmarks" do
+    visit solr_document_path "nyu-2451-34564"
+    click_button "Bookmark"
     visit bookmarks_path
-    expect(page).to have_css '.document', count: 1
+    expect(page).to have_css ".document", count: 1
   end
 end

data/spec/features/citations_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+feature "Blacklight Citation" do
+  scenario "index has created citations" do
+    sign_in
+    visit "/catalog/princeton-1r66j405w"
+    click_link "Cite"
+    expect(page).to have_text "Copy Citation"
+  end
+end

data/spec/features/configurable_basemap_spec.rb

@@ -1,34 +1,35 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Configurable basemap', js: true do
-  scenario 'defaults to positron' do
+require "spec_helper"
+
+feature "Configurable basemap", js: true do
+  scenario "defaults to positron" do
     visit root_path
     expect(page).to have_css "img[src*='carto']"
   end
-  feature 'without provided basemap config' do
+  feature "without provided basemap config" do
     before do
       CatalogController.blacklight_config.basemap_provider = nil
     end
-    scenario 'has Carto map' do
+    scenario "has Carto map" do
       visit root_path
       expect(page).to have_css "img[src*='carto']"
     end
   end
-  feature 'using darkMatter' do
+  feature "using darkMatter" do
     before do
-      CatalogController.blacklight_config.basemap_provider = 'darkMatter'
+      CatalogController.blacklight_config.basemap_provider = "darkMatter"
     end
-    scenario 'has darkMatter map' do
+    scenario "has darkMatter map" do
       visit root_path
       expect(page).to have_css "img[src*='dark_all']"
     end
   end
-  feature 'using openstreetmapHot' do
+  feature "using openstreetmapHot" do
     before do
-      CatalogController.blacklight_config.basemap_provider = 'openstreetmapHot'
+      CatalogController.blacklight_config.basemap_provider = "openstreetmapHot"
     end
-    scenario 'has openstreetmapHot map' do
+    scenario "has openstreetmapHot map" do
       visit root_path
       expect(page).to have_css "img[src*='hot']"
     end

data/spec/features/data_dictionary_download_spec.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Data dictionary download tool' do
-  feature 'when data_dictionary reference present' do
-    scenario 'shows up in tools' do
-      visit solr_document_path 'nyu_2451_34502'
-      expect(page).to have_css 'li.data_dictionary a', text: 'Documentation'
+require "spec_helper"
+
+feature "Data dictionary download tool" do
+  feature "when data_dictionary reference present" do
+    scenario "shows up in tools" do
+      visit solr_document_path "nyu_2451_34502"
+      expect(page).to have_css "li.data_dictionary a", text: "Documentation"
     end
   end
-  feature 'when data_dictionary reference absent' do
-    scenario 'download tool is not rendered' do
-      visit solr_document_path 'stanford-cg357zz0321'
-      expect(page).not_to have_css 'li.data_dictionary a', text: 'Documentation'
+  feature "when data_dictionary reference absent" do
+    scenario "download tool is not rendered" do
+      visit solr_document_path "stanford-cg357zz0321"
+      expect(page).not_to have_css "li.data_dictionary a", text: "Documentation"
     end
   end
 end

data/spec/features/download_layer_spec.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Download layer' do
+require "spec_helper"
+
+feature "Download layer" do
   let(:shapefile_download) { instance_double(Geoblacklight::ShapefileDownload) }
   let(:kmz_download) { instance_double(Geoblacklight::KmzDownload) }
 
@@ -10,102 +11,102 @@ feature 'Download layer' do
     allow(Geoblacklight::KmzDownload).to receive(:new).and_return(kmz_download)
   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')
-    find('#downloads-button').click
-    find('a[data-download-type="shapefile"]', text: 'Export Shapefile').click
+  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")
+    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'
+      text: "Your file mit-f6rqs4ucovjk2-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'))
-    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_css 'div.alert.alert-danger', text: 'Sorry, the requested file could not be downloaded. Try downloading it directly from:'
-    expect(page).to have_css 'a', text: 'http://www.example.com/failed'
+  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"))
+    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_css "div.alert.alert-danger", text: "Sorry, the requested file could not be downloaded. Try downloading it directly from:"
+    expect(page).to have_css "a", text: "http://www.example.com/failed"
   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')
-    find('#downloads-button').click
-    find('#downloads-collapse a[data-download-type="kmz"]', text: 'Export KMZ').click
+  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")
+    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'
+      text: "Your file mit-f6rqs4ucovjk2-kmz.kmz is ready for download"
     )
   end
 
-  scenario 'jpg download option should be present under toggle' do
-    visit solr_document_path('princeton-02870w62c')
-    find('#downloads-button').click
-    expect(page).to have_css('#downloads-collapse a', text: 'Original JPG')
+  scenario "jpg download option should be present under toggle" do
+    visit solr_document_path("princeton-02870w62c")
+    find("#downloads-button").click
+    expect(page).to have_css("#downloads-collapse a", text: "Original JPG")
   end
 
-  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')
+  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")
   end
 
-  scenario 'options should be available under toggle' do
-    visit solr_document_path('mit-f6rqs4ucovjk2')
-    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')
+  scenario "options should be available under toggle" do
+    visit solr_document_path("mit-f6rqs4ucovjk2")
+    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")
   end
 
-  scenario 'restricted layer should not have download available to non logged in user' do
-    visit solr_document_path('stanford-cg357zz0321')
-    expect(page).to have_css 'a', text: 'Login to View and Download'
-    expect(page).not_to have_css 'button', text: 'Download'
+  scenario "restricted layer should not have download available to non logged in user" do
+    visit solr_document_path("stanford-cg357zz0321")
+    expect(page).to have_css "a", text: "Login to View and Download"
+    expect(page).not_to have_css "button", text: "Download"
   end
 
-  scenario 'restricted layer should have download available to logged in user' do
+  scenario "restricted layer should have download available to logged in user" do
     sign_in
-    visit solr_document_path('stanford-cg357zz0321')
-    expect(page).not_to have_css 'a', text: 'Login to view and download'
-    expect(page).to have_css 'button', text: 'Download'
+    visit solr_document_path("stanford-cg357zz0321")
+    expect(page).not_to have_css "a", text: "Login to view and download"
+    expect(page).to have_css "button", text: "Download"
   end
 
-  scenario 'layer with direct download and wms/wfs should include all download types' do
+  scenario "layer with direct download and wms/wfs should include all download types" do
     sign_in
-    visit solr_document_path('stanford-cg357zz0321')
-    find('#downloads-button').click
-    expect(page).to have_css('#downloads-collapse a', text: 'Original')
-    expect(page).to have_css('#downloads-collapse a', text: 'Export')
+    visit solr_document_path("stanford-cg357zz0321")
+    find("#downloads-button").click
+    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')
+  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
+  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
+    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
+      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')
+      allow(hgl_download).to receive(:get).and_return("success")
 
-      within '#hglRequest' do
-        fill_in('Email', with: 'foo@example.com')
-        click_button('Request')
+      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')
+      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/empty_search_spec.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Empty search' do
+require "spec_helper"
+
+feature "Empty search" do
   before do
     visit root_path
   end
-  scenario 'Entering empty search returns results page' do
-    click_button 'search'
-    expect(page).to have_css '#documents'
+  scenario "Entering empty search returns results page" do
+    click_button "search"
+    expect(page).to have_css "#documents"
   end
 end

data/spec/features/esri_viewer_spec.rb

@@ -1,42 +1,43 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'feature_layer reference', js: true do
-  scenario 'displays image map layer' do
-    skip 'spec depend on potentially flaky external services'
-    visit solr_document_path '32653ed6-8d83-4692-8a06-bf13ffe2c018'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+require "spec_helper"
+
+feature "feature_layer reference", js: true do
+  scenario "displays image map layer" do
+    skip "spec depend on potentially flaky external services"
+    visit solr_document_path "32653ed6-8d83-4692-8a06-bf13ffe2c018"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css "img.leaflet-image-layer", visible: true
   end
-  scenario 'displays dynamic layer (all layers)' do
-    skip 'spec depend on potentially flaky external services'
-    visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  scenario "displays dynamic layer (all layers)" do
+    skip "spec depend on potentially flaky external services"
+    visit solr_document_path "90f14ff4-1359-4beb-b931-5cb41d20ab90"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css "img.leaflet-image-layer", visible: true
   end
-  scenario 'displays dynamic layer (single layer)' do
-    skip 'spec depend on potentially flaky external services'
-    visit solr_document_path '4669301e-b4b2-4c8b-bf40-01b968a2865b'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  scenario "displays dynamic layer (single layer)" do
+    skip "spec depend on potentially flaky external services"
+    visit solr_document_path "4669301e-b4b2-4c8b-bf40-01b968a2865b"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css "img.leaflet-image-layer", visible: true
   end
-  scenario 'displays feature layer' do
-    pending 'cannot currently test for svg feature'
-    visit solr_document_path 'f406332e63eb4478a9560ad86ae90327_18'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
+  scenario "displays feature layer" do
+    pending "cannot currently test for svg feature"
+    visit solr_document_path "f406332e63eb4478a9560ad86ae90327_18"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(Nokogiri::HTML.parse(page.body).css("g").length).to eq 23
     fail
   end
-  scenario 'displays tiled map layer' do
-    skip 'spec depend on potentially flaky external services'
-    visit solr_document_path 'nyu-test-soil-survey-map'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
+  scenario "displays tiled map layer" do
+    skip "spec depend on potentially flaky external services"
+    visit solr_document_path "nyu-test-soil-survey-map"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css "img.leaflet-tile.leaflet-tile-loaded", visible: true
   end
-  scenario 'displays Esri WMS layer' do
-    skip 'spec depend on potentially flaky external services'
-    visit solr_document_path 'purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
+  scenario "displays Esri WMS layer" do
+    skip "spec depend on potentially flaky external services"
+    visit solr_document_path "purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa"
+    expect(page).to have_css ".leaflet-control-zoom", visible: true
+    expect(page).to have_css "img.leaflet-tile.leaflet-tile-loaded", visible: true
   end
 end

data/spec/features/exports_spec.rb

@@ -1,28 +1,29 @@
 # frozen_string_literal: true
-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'
+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
-        visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
-        expect(page).to have_css 'li.arcgis a', text: 'Open in ArcGIS Online'
+  feature "when esri web services are available" do
+    feature "Open in ArcGIS Online" do
+      scenario "shows up in tools" do
+        visit solr_document_path "90f14ff4-1359-4beb-b931-5cb41d20ab90"
+        expect(page).to have_css "li.arcgis a", text: "Open in ArcGIS Online"
       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'
+  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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Leaflet fullscreen control', js: true do
-  scenario 'IIIF layer should have full screen control' do
-    visit solr_document_path('princeton-sx61dn82p')
-    expect(page).to have_css('.leaflet-control-fullscreen-button')
+feature "Leaflet fullscreen control", js: true do
+  scenario "IIIF layer should have full screen control" do
+    visit solr_document_path("princeton-sx61dn82p")
+    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')
+  scenario "WMS layer should have full screen control" do
+    visit solr_document_path("stanford-cz128vq0535")
+    expect(page).to have_css(".leaflet-control-fullscreen-button")
   end
 end

data/spec/features/help_text_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Help Text' do
-  scenario 'Displays help text entry' do
-    visit '/catalog/stanford-cg357zz0321'
-    expect(page).to have_css '.help-text', count: 1
+require "spec_helper"
+
+feature "Help Text" do
+  scenario "Displays help text entry" do
+    visit "/catalog/stanford-cg357zz0321"
+    expect(page).to have_css ".help-text", count: 1
   end
 end

data/spec/features/home_page_spec.rb

@@ -1,46 +1,47 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Home page', js: true do # use js: true for tests which require js, but it slows things down
+require "spec_helper"
+
+feature "Home page", js: true do # use js: true for tests which require js, but it slows things down
   before do
     visit root_path
   end
-  scenario 'navbar' do
-    expect(page).to have_css '#bookmarks_nav'
-    expect(page).to have_css 'a', text: 'History'
+  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'
+  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
   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
-    expect(page).to have_css 'a.more_facets_link', count: 4
-    click_link 'Counties'
-    expect(page).to have_css '.filter-name', text: 'Subject'
-    expect(page).to have_css '.filter-value', text: 'Counties'
+  scenario "find by category" do
+    expect(page).to have_css ".category-block", count: 4
+    expect(page).to have_css ".home-facet-link", count: 36
+    expect(page).to have_css "a.more_facets_link", count: 4
+    click_link "Counties"
+    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('img.leaflet-tile', minimum: 3)
+  scenario "map should be visible" do
+    within "#main-container" do
+      expect(page).to have_css("#map")
+      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
-      find('.search-control a').click
+  scenario "clicking map search should create a spatial search" do
+    within "#map" do
+      find(".search-control a").click
       expect(page.current_url).to match(/bbox=/)
     end
-    expect(page).to have_css '#documents'
+    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')
+  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
 end