blacklight 5.1.1 → 5.2.0

data/lib/generators/blacklight/templates/config/jetty.yml

@@ -1,6 +1,10 @@
-default:
+development:
+  startup_wait: 15
   jetty_port: 8983
 test:
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
-  jetty_home: <%= ENV['TEST_JETTY_PATH'] || File.join(Rails.root, 'test_jetty') %>
-  startup_wait: 15
+  startup_wait: 60
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
+production:
+  startup_wait: 15
+  jetty_port: 8983

data/lib/generators/blacklight/templates/config/solr.yml

@@ -14,3 +14,5 @@ development:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr" %>
 test: &test
   url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8888}/solr" %>
+production:
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr" %>

data/spec/controllers/catalog_controller_spec.rb

@@ -70,18 +70,13 @@ describe CatalogController do
         before do
           controller.stub(:get_search_results) 
         end
-        it "should include :search key with hash" do
-          get :index
-          expect(session[:search]).to_not be_nil
-          expect(session[:search]).to be_kind_of(Hash)
-        end
         it "should include search hash with key :q" do
           get :index, :q => @user_query
           expect(session[:search]).to_not be_nil
-          expect(session[:search].keys).to include :id
+          expect(session[:search].keys).to include 'id'
           
-          search = Search.find(session[:search][:id])
-          expect(search.query_params[:q]).to eq @user_query
+          search = Search.find(session[:search]['id'])
+          expect(search.query_params['q']).to eq @user_query
         end
       end
 
@@ -200,23 +195,33 @@ describe CatalogController do
 
   end # describe index action
 
-  describe "update action" do
+  describe "track action" do
     doc_id = '2007020969'
 
     it "should set counter value into session[:search]" do
-      put :update, :id => doc_id, :counter => 3
-      expect(session[:search][:counter]).to eq "3"
+      put :track, :id => doc_id, :counter => 3
+      expect(session[:search]['counter']).to eq "3"
     end
 
     it "should redirect to show action for doc id" do
-      put :update, :id => doc_id, :counter => 3
+      put :track, :id => doc_id, :counter => 3
       assert_redirected_to(catalog_path(doc_id))
     end
 
     it "HTTP status code for redirect should be 303" do
-      put :update, :id => doc_id, :counter => 3
+      put :track, :id => doc_id, :counter => 3
       expect(response.status).to eq 303
     end
+
+    it "should redirect to the path given in the redirect param" do
+      put :track, :id => doc_id, :counter => 3, redirect: '/xyz'
+      assert_redirected_to("/xyz")
+    end
+
+    it "should redirect to the path of the uri given in the redirect param" do
+      put :track, :id => doc_id, :counter => 3, redirect: 'http://localhost:3000/xyz'
+      assert_redirected_to("/xyz")
+    end
   end
 
   # SHOW ACTION
@@ -254,7 +259,7 @@ describe CatalogController do
         @search_session = { :id => current_search.id }
       end
     it "should set previous document if counter present in session" do
-      session[:search] = @search_session.merge(:counter => 2)
+      session[:search] = @search_session.merge('counter' => 2)
       get :show, :id => doc_id
       expect(assigns[:previous_document]).to_not be_nil
     end
@@ -263,14 +268,14 @@ describe CatalogController do
       expect(assigns[:previous_document]).to be_nil
       expect(assigns[:next_document]).to be_nil
     end
-    it "should not set previous or next document if session[:search][:counter] is nil" do
+    it "should not set previous or next document if session[:search]['counter'] is nil" do
       session[:search] = {}
       get :show, :id => doc_id
       expect(assigns[:previous_document]).to be_nil
       expect(assigns[:next_document]).to be_nil
     end
     it "should set next document if counter present in session" do
-      session[:search] = @search_session.merge(:counter => 2)
+      session[:search] = @search_session.merge('counter' => 2)
       get :show, :id => doc_id
       expect(assigns[:next_document]).to_not be_nil
     end
@@ -483,6 +488,7 @@ describe CatalogController do
       req = {}
       res = {}
       fake_error = RSolr::Error::Http.new(req, res) 
+      Rails.env.stub(:test? => false)
       controller.stub(:get_search_results) { |*args| raise fake_error }
       controller.logger.should_receive(:error).with(fake_error)
       get :index, :q=>"+"
@@ -514,10 +520,7 @@ describe CatalogController do
       controller.stub(:has_user_authentication_provider?) { false }
         @mock_response = double()
         @mock_document = double()
-        @mock_response.stub(:docs => [], :total => 1, :facets => [], :facet_queries => {}, :facet_by_field_name => nil)
-        @mock_document = double()
-        controller.stub(:find => @mock_response, 
-                        :get_single_doc_via_search => @mock_document)
+        controller.stub(:get_single_doc_via_search => @mock_document)
     end
 
     it "should not show user util links" do
@@ -634,7 +637,7 @@ describe CatalogController do
     it "should use an existing search session if the search is in the uri" do
       s = Search.create(:query_params => { :q => "x" })
       session[:search] ||= {}
-      session[:search][:id] = s.id
+      session[:search]['id'] = s.id
       session[:history] ||= []
       session[:history] << s.id
       session = controller.send(:current_search_session)
@@ -642,6 +645,23 @@ describe CatalogController do
       expect(session).to eq(s)
     end
   end
+
+  describe "#has_search_parameters?" do
+    subject { controller.has_search_parameters? }
+    describe "none" do
+      before { controller.stub(params: { }) }
+      it { should be_false }
+    end
+    describe "with a query" do
+      before { controller.stub(params: { q: 'hello' }) }
+      it { should be_true }
+    end
+    describe "with a facet" do
+      before { controller.stub(params: { f: { "field" => ["value"]} }) }
+      it { should be_true }
+    end
+  end
+
 end
 
 
@@ -653,4 +673,3 @@ def assert_facets_have_values(facets)
     expect(facet.items).to have_at_least(1).item
   end
 end
-

data/spec/features/alternate_controller_spec.rb

@@ -29,7 +29,7 @@ describe "Alternate Controller Behaviors" do
     fill_in "q", :with=>"history"
     click_button 'search'
     expect(page).to have_selector ".document-thumbnail"
-    expect(page).to have_selector ".document-thumbnail a[data-counter]"
+    expect(page).to have_selector ".document-thumbnail a[data-context-href]"
     expect(page).to have_selector ".document-thumbnail a img"
 
   end

data/spec/features/search_filters_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Facets" do
   it "should work without a search term" do
     visit root_path
-    within '#facet-language' do
+    within "#facet-language_facet" do
       click_link "Tibetan"
     end
     within "#sortAndPerPage" do
@@ -13,7 +13,7 @@ describe "Facets" do
     expect(page).to have_selector(".blacklight-language_facet")
     expect(page).to have_selector(".blacklight-language_facet.facet_limit-active")
     
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "6")
     end
@@ -22,11 +22,11 @@ describe "Facets" do
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
-    within "#facet-region" do
+    within "#facet-subject_geo_facet" do
       expect(page).to have_selector("span.selected", :text => "India")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
@@ -40,13 +40,13 @@ describe "Facets" do
       expect(page).to have_content "1 - 9 of 9"
     end
 
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link "Tibetan"
     end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
@@ -60,7 +60,7 @@ describe "Facets" do
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 entry found"
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -72,14 +72,14 @@ describe "Facets" do
 
   it "should allow removing filters" do
     visit root_path
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link "Tibetan"
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "6")
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link 'remove'
     end
     expect(page).to_not have_link 'remove'
@@ -90,17 +90,17 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link 'Tibetan'
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
 
     click_link '2004'
 
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -111,7 +111,7 @@ describe "Facets" do
     fill_in "q", with: 'china'
     click_button 'search'
 
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -125,15 +125,15 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link 'Tibetan'
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
     click_link 'title'
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
@@ -147,17 +147,17 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link 'Tibetan'
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
     within '#per_page-dropdown' do
       click_link '20'
     end
-    within "#facet-language" do
+    within "#facet-language_facet" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "2")
     end
@@ -167,14 +167,14 @@ describe "Facets" do
     end
   end
   it "should be collapsed when not selected", :js => true do
-    pending("Test passes locally but not on Travis.")
+    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
     end
   end
   it "should expand when the heading is clicked", :js => true do
-    pending("Test passes locally but not on Travis.")
+    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
@@ -183,7 +183,7 @@ describe "Facets" do
     end
   end
   it "should expand when the anchor is clicked", :js => true do
-    pending("Test passes locally but not on Travis.")
+    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
@@ -192,7 +192,7 @@ describe "Facets" do
     end
   end
   it "should keep selected facets expanded on page load", :js => true do
-    pending("Test passes locally but not on Travis.")
+    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       click_link "Topic"

data/spec/features/search_results_spec.rb

@@ -55,14 +55,19 @@ describe "Search Results" do
     click_on 'Pluvial nectar of blessings'
     expect(page).to have_content "« Previous | 10 of 30 | Next »"
     prev = page.find("#previousNextDocument .previous")
-    expect(prev['data-counter']).to eq "9"
-    expect(prev['data-search_id']).to eq search_id
+    expect(prev['data-context-href']).to eq "/catalog/2003546302/track?counter=9&search_id=#{search_id}"
 
     click_on "« Previous"
 
     prev = page.find("#previousNextDocument .previous")
-    expect(prev['data-counter']).to eq "8"
-    expect(prev['data-search_id']).to eq search_id
+    expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&search_id=#{search_id}"
+  end
+  
+  it "should redirect context urls to the original url", :js => true do
+    search_for ''
+    first('.index_title a').click
+    expect(page).to have_content "« Previous | 1 of 30 | Next »"
+    expect(page.current_url).to_not have_content "/track"
   end
 
 end

data/spec/features/search_sort_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Search Sort" do
   it "should sort on facet results with no search terms" do
     visit root_path
-    within "#facet-language" do
+    within "#facet-language_facet" do
       click_link 'English'
     end
     expect(page).to have_content 'Sort by relevance'

data/spec/helpers/blacklight_helper_spec.rb

@@ -32,6 +32,22 @@ describe BlacklightHelper do
     end
   end
 
+  describe "#render_page_title" do
+    it "should look in content_for(:page_title)" do
+      helper.content_for(:page_title) { "xyz" }
+      expect(helper.render_page_title).to eq "xyz"
+    end
+
+    it "should look in the @page_title ivar" do
+      assign(:page_title, "xyz")
+      expect(helper.render_page_title).to eq "xyz"
+    end
+
+    it "should default to the application name" do
+      expect(helper.render_page_title).to eq helper.application_name
+    end
+  end
+
   describe "render_link_rel_alternates" do
       class MockDocumentAppHelper
         include Blacklight::Solr::Document
@@ -389,6 +405,9 @@ describe BlacklightHelper do
   end
 
   describe "render_field_value" do
+    before do
+      Deprecation.stub(:warn)
+    end
     it "should join and html-safe values" do
       expect(helper.render_field_value(['a', 'b'])).to eq "a, b"
     end
@@ -426,4 +445,72 @@ describe BlacklightHelper do
       expect(helper.should_show_spellcheck_suggestions? response).to be_false
     end
   end
+  
+  describe "#render_document_partials" do
+    let(:doc) { double }
+    before do
+      helper.stub(document_partial_path_templates: [])
+    end
+    
+    it "should get the document format from document_partial_name" do
+      helper.should_receive(:document_partial_name).with(doc, :xyz)
+      helper.render_document_partial(doc, :xyz)    
+    end
+    
+    context "with a 1-arg form of document_partial_name" do
+      it "should only call the 1-arg form of the document_partial_name" do
+        helper.should_receive(:method).with(:document_partial_name).and_return(double(arity: 1))
+        helper.should_receive(:document_partial_name).with(doc)
+        Deprecation.should_receive(:warn)
+        helper.render_document_partial(doc, nil)
+      end
+    end
+  end
+
+  describe "#document_partial_name" do
+    let(:blacklight_config) { Blacklight::Configuration.new }
+
+    before do
+      helper.stub(blacklight_config: blacklight_config)
+    end
+
+    context "with a solr document with empty fields" do
+      let(:document) { SolrDocument.new }
+      it "should be the default value" do
+        expect(helper.document_partial_name(document)).to eq 'default'
+      end
+    end
+
+    context "with a solr document with the display type field set" do
+      let(:document) { SolrDocument.new 'my_field' => 'xyz'}
+
+      before do
+        blacklight_config.show.display_type_field = 'my_field'
+      end
+
+      it "should use the value in the configured display type field" do
+        expect(helper.document_partial_name(document)).to eq 'xyz'
+      end
+
+      it "should use the value in the configured display type field if the action-specific field is empty" do
+        expect(helper.document_partial_name(document, :some_action)).to eq 'xyz'
+      end
+    end
+
+    context "with a solr doucment with an action-specific field set" do
+
+      let(:document) { SolrDocument.new 'my_field' => 'xyz', 'other_field' => 'abc' }
+
+      before do
+        blacklight_config.show.media_display_type_field = 'my_field'
+        blacklight_config.show.metadata_display_type_field = 'other_field'
+      end
+
+      it "should use the value in the action-specific fields" do
+        expect(helper.document_partial_name(document, :media)).to eq 'xyz'
+        expect(helper.document_partial_name(document, :metadata)).to eq 'abc'
+      end
+
+    end
+  end
 end

data/spec/helpers/catalog_helper_spec.rb

@@ -126,27 +126,22 @@ describe CatalogHelper do
 
   describe "should_autofocus_on_search_box?" do
     it "should be focused if we're on a catalog-like index page without query or facet parameters" do
-      helper.stub(:controller => CatalogController.new, :action_name => "index", :params => { })
+      helper.stub(controller: CatalogController.new, action_name: "index", has_search_parameters?: false)
       expect(helper.should_autofocus_on_search_box?).to be_true
     end
 
     it "should not be focused if we're not on a catalog controller" do
-      helper.stub(:controller => ApplicationController.new)
+      helper.stub(controller: ApplicationController.new)
       expect(helper.should_autofocus_on_search_box?).to be_false
     end
 
     it "should not be focused if we're not on a catalog controller index" do
-      helper.stub(:controller => CatalogController.new, :action_name => "show")
+      helper.stub(controller: CatalogController.new, action_name: "show")
       expect(helper.should_autofocus_on_search_box?).to be_false
     end
 
-    it "should not be focused if a search string is provided" do
-      helper.stub(:controller => CatalogController.new, :action_name => "index", :params => { :q => "hello"})
-      expect(helper.should_autofocus_on_search_box?).to be_false
-    end
-
-    it "should not be focused if a facet is selected" do
-      helper.stub(:controller => CatalogController.new, :action_name => "index", :params => { :f => { "field" => ["value"]}})
+    it "should not be focused if a search parameters are provided" do
+      helper.stub(controller: CatalogController.new, action_name: "index", has_search_parameters?: true)
       expect(helper.should_autofocus_on_search_box?).to be_false
     end
   end

data/spec/helpers/configuration_helper_spec.rb

@@ -100,4 +100,25 @@ describe BlacklightConfigurationHelper do
       label = helper.solr_field_label "default text", :key_a, :key_b
     end
   end
-end
+  
+  describe "#default_per_page" do
+    it "should be the configured default per page" do
+      helper.stub(blacklight_config: double(default_per_page: 42))
+      expect(helper.default_per_page).to eq 42
+    end
+    
+    it "should be the first per-page value if a default isn't set" do
+      helper.stub(blacklight_config: double(default_per_page: nil, per_page: [11, 22]))
+      expect(helper.default_per_page).to eq 11
+    end
+  end
+  
+  describe "#per_page_options_for_select" do
+    it "should be the per-page values formatted as options_for_select" do
+      helper.stub(blacklight_config: double(per_page: [11, 22, 33]))
+      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only\"> per page</span>", 11]
+      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only\"> per page</span>", 22]
+      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only\"> per page</span>", 33]
+    end
+  end
+end

data/spec/helpers/facets_helper_spec.rb

@@ -350,4 +350,10 @@ describe FacetsHelper do
       expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq '01 Jan 00:00'
     end
   end
+
+  describe "#facet_field_id" do
+    it "should be the parameterized version of the facet field" do
+      expect(helper.facet_field_id double(field: 'some field')).to eq "facet-some-field"
+    end
+  end
 end

data/spec/helpers/render_constraints_helper_spec.rb

@@ -25,8 +25,7 @@ describe RenderConstraintsHelper do
     end
     it "should have a link relative to the current url" do
       result = helper.render_filter_element('type', ['journal'], {:q=>'biz'})
-      # I'm not certain how the ampersand gets in there. It's not important.
-      expect(result).to have_link "Remove constraint Type: journal", href: "/catalog?&q=biz"
+      expect(result).to have_link "Remove constraint Type: journal", href: "/catalog?q=biz"
     end
   end
 

data/spec/helpers/url_helper_spec.rb

@@ -18,6 +18,41 @@ describe BlacklightUrlHelper do
     helper.stub(current_search_session: nil)
   end
 
+  describe "url_for_document" do
+    let(:controller_class) { ::CatalogController.new }
+
+    before do
+      helper.stub(controller: controller_class)
+      helper.stub(controller_name: controller_class.controller_name)
+    end
+
+    it "should be a polymorphic routing-ready object" do
+      doc = double
+      expect(helper.url_for_document(doc)).to eq doc
+    end
+
+    it "should be a catalog controller-specific route" do
+      doc = SolrDocument.new
+      expect(helper.url_for_document(doc)).to eq({controller: 'catalog', action: :show, id: doc})
+    end
+
+    context "within an alternative catalog controller" do
+      let(:controller_class) { ::AlternateController.new }
+
+      it "should be a catalog controller-specific route" do
+        doc = SolrDocument.new
+        expect(helper.url_for_document(doc)).to eq({controller: 'alternate', action: :show, id: doc})
+      end
+    end
+
+    it "should be a polymorphic route if the solr document responds to #to_model with a non-SolrDocument" do
+      some_model = double
+      doc = SolrDocument.new
+      doc.stub(to_model: some_model)
+      expect(helper.url_for_document(doc)).to eq doc
+    end
+  end
+
   describe "link_back_to_catalog" do
     let(:query_params)  {{:q => "query", :f => "facets", :per_page => "10", :page => "2", :controller=>'catalog'}}
     let(:bookmarks_query_params) {{ :page => "2", :controller=>'bookmarks'}}
@@ -210,7 +245,15 @@ describe BlacklightUrlHelper do
     it "should convert the counter parameter into a data- attribute" do
       data = {'id'=>'123456','title_display'=>['654321']}
       @document = SolrDocument.new(data)
-      expect(helper.link_to_document(@document, { :label => :title_display, :counter => 5  })).to match /data-counter="5"/
+      expect(helper.link_to_document(@document, { :label => :title_display, :counter => 5  })).to match /\/catalog\/123456\/track\?counter=5/
+    end
+
+    it "should merge the data- attributes from the options with the counter params" do
+      data = {'id'=>'123456','title_display'=>['654321']}
+      @document = SolrDocument.new(data)
+      link = helper.link_to_document @document, { data: { x: 1 }  }
+      expect(link).to have_selector '[data-x]'
+      expect(link).to have_selector '[data-context-href]'
     end
 
     it "passes on the title attribute to the link_to_with_data method" do
@@ -352,4 +395,4 @@ describe BlacklightUrlHelper do
       expect(added_facet_params_from_facet_action).to eq added_facet_params.except(Blacklight::Solr::FacetPaginator.request_keys[:page], Blacklight::Solr::FacetPaginator.request_keys[:sort])     
     end
   end
-end
+end

data/spec/lib/blacklight/routes_spec.rb

@@ -7,8 +7,8 @@ describe Blacklight::Routes do
     describe "without constraints" do
       let(:options) { Hash.new }
       it "should define the resources" do
-        router.should_receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show, :update]})
-        router.should_receive(:resources).with(:records, :only=>[:show, :update])
+        router.should_receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show]})
+        router.should_receive(:resources).with(:records, :only=>[:show])
         subject.solr_document(:records)
       end
     end
@@ -16,8 +16,8 @@ describe Blacklight::Routes do
     describe "with constraints" do
       let(:options) { { :constraints => {id: /[a-z]+/, format: false } } }
       it "should define the resources" do
-        router.should_receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show, :update], :constraints=>{:id=>/[a-z]+/, :format=>false} })
-        router.should_receive(:resources).with(:records, :only=>[:show, :update], :constraints=>{:id=>/[a-z]+/, :format=>false})
+        router.should_receive(:resources).with(:solr_document, {:path=>:records, :controller=>:records, :only=>[:show], :constraints=>{:id=>/[a-z]+/, :format=>false} })
+        router.should_receive(:resources).with(:records, :only=>[:show], :constraints=>{:id=>/[a-z]+/, :format=>false})
         subject.solr_document(:records)
       end
     end