blacklight 4.2.2 → 4.3.0

data/spec/controllers/bookmarks_controller_spec.rb

@@ -29,7 +29,7 @@ describe BookmarksController do
     end
 
    it "has a 500 status code when delete is not success" do
-      bm = mock(Bookmark)
+      bm = double(Bookmark)
       @controller.stub_chain(:current_or_guest_user, :existing_bookmark_for).and_return(bm)
       @controller.stub_chain(:current_or_guest_user, :bookmarks, :delete).and_return(false)
      

data/spec/controllers/catalog_controller_spec.rb

@@ -166,8 +166,8 @@ describe CatalogController do
     
     describe "previous/next documents" do
       before do
-        @mock_response = mock()
-        @mock_document = mock()
+        @mock_response = double()
+        @mock_document = double()
         @mock_document.stub(:export_formats => {})
         controller.stub(:get_solr_response_for_doc_id => [@mock_response, @mock_document], 
                         :get_single_doc_via_search => @mock_document)
@@ -212,8 +212,8 @@ describe CatalogController do
       response.should be_success
     end
     it "should render show.html.erb" do
-      @mock_response = mock()
-      @mock_document = mock()
+      @mock_response = double()
+      @mock_document = double()
       @mock_document.stub(:export_formats => {})
       controller.stub(:get_solr_response_for_doc_id => [@mock_response, @mock_document], 
                       :get_single_doc_via_search => @mock_document)
@@ -224,7 +224,7 @@ describe CatalogController do
     describe "@document" do
       before do
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
       end
@@ -250,7 +250,7 @@ describe CatalogController do
       end
       before do
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
 
@@ -262,7 +262,7 @@ describe CatalogController do
 
         # Rails3 needs this to propertly setup a new mime type and
         # render the results. 
-        ActionController.add_renderer :mock do |template, options|
+        ActionController.add_renderer :double do |template, options|
           send_data "mock_export", :type => Mime::MOCK
         end
         Mime::Type.register "application/mock", :mock
@@ -286,10 +286,10 @@ describe CatalogController do
 
   describe "opensearch" do
       before do
-        @mock_response = mock()
-        @mock_document = mock()
+        @mock_response = double()
+        @mock_document = double()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }, { :id => 'my_other_doc'}])
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
       end
@@ -306,10 +306,10 @@ describe CatalogController do
   describe "email/sms" do
     doc_id = '2007020969'
       before do
-        @mock_response = mock()
-        @mock_document = mock()
+        @mock_response = double()
+        @mock_document = double()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }, { :id => 'my_other_doc'}])
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
       end
@@ -365,14 +365,14 @@ describe CatalogController do
 
   describe "errors" do
     it "should return status 404 for a record that doesn't exist" do
-        @mock_response = mock()
+        @mock_response = double()
         @mock_response.stub(:docs => [])
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
       get :show, :id=>"987654321"
       request.flash[:notice].should == "Sorry, you have requested a record that doesn't exist."
-      response.should_not be_success
+      response.should render_template('index')
       response.status.should == 404
     end
     it "should redirect the user to the root url for a bad search" do
@@ -394,7 +394,7 @@ describe CatalogController do
       res = {}
       fake_error = RSolr::Error::Http.new(req, res) 
       controller.stub(:get_search_results) { |*args| raise fake_error }
-      controller.flash.stub!(:sweep)
+      controller.flash.stub(:sweep)
       controller.stub(:flash).and_return(:notice => I18n.t('blacklight.search.errors.request_error'))
       expect {
       get :index, :q=>"+"
@@ -408,10 +408,10 @@ describe CatalogController do
 
     before do
       controller.stub(:has_user_authentication_provider?) { false }
-        @mock_response = mock()
-        @mock_document = mock()
+        @mock_response = double()
+        @mock_document = double()
         @mock_response.stub(:docs => [], :total => 1, :facets => [], :facet_queries => {}, :facet_by_field_name => nil)
-        @mock_document = mock()
+        @mock_document = double()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
     end

data/spec/helpers/blacklight_helper_spec.rb

@@ -235,17 +235,17 @@ describe BlacklightHelper do
 
    describe "render body class" do
       it "should include a serialization of the current controller name" do
-        @controller = mock("controller")
-        @controller.should_receive(:controller_name).any_number_of_times.and_return("123456")
-        @controller.should_receive(:action_name).any_number_of_times.and_return("abcdef")
+        @controller = double("controller")
+        @controller.stub(:controller_name).and_return("123456")
+        @controller.stub(:action_name).and_return("abcdef")
 
 	render_body_class.split(' ').should include('blacklight-123456')
       end
 
       it "should include a serialization of the current action name" do
-        @controller = mock("controller")
-        @controller.should_receive(:controller_name).any_number_of_times.and_return("123456")
-        @controller.should_receive(:action_name).any_number_of_times.and_return("abcdef")
+        @controller = double("controller")
+        @controller.stub(:controller_name).and_return("123456")
+        @controller.stub(:action_name).and_return("abcdef")
 
 	render_body_class.split(' ').should include('blacklight-123456-abcdef')
       end
@@ -305,20 +305,16 @@ describe BlacklightHelper do
    describe "render_document_index" do
      it "should render the document_list" do
        @document_list = ['a', 'b']
-       self.stub!(:document_index_view_type) { "gallery" }
        self.should_receive(:render).with(hash_including(:partial => 'document_gallery'))
-       render_document_index
+       render_document_index_with_view 'gallery', @document_list
      end
 
      it "should fall back on more specific templates" do
-       @document_list = ['a', 'b']
-       self.stub!(:document_index_view_type) { "gallery" }
-
        ex = ActionView::MissingTemplate.new [], '', '', '',''
        self.should_receive(:render).with(hash_including(:partial => 'document_gallery')).and_raise(ex)
        self.should_receive(:render).with(hash_including(:partial => 'catalog/document_gallery')).and_raise(ex)
        self.should_receive(:render).with(hash_including(:partial => 'catalog/document_list'))
-       render_document_index
+       render_document_index_with_view 'gallery', @document_list
      end
    end
 
@@ -416,7 +412,7 @@ describe BlacklightHelper do
       @doc_id = "MOCK_ID1"
       @document = MockDocumentAppHelper.new(:id => @doc_id)
       render_params = {:controller => "controller", :action => "action"}
-      helper.stub!(:params).and_return(render_params)
+      helper.stub(:params).and_return(render_params)
     end
     it "generates <link rel=alternate> tags" do
 
@@ -489,37 +485,46 @@ describe BlacklightHelper do
     end
 
     it "should check for an explicit value" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       value = helper.render_index_field_value :value => 'asdf', :document => doc, :field => 'asdf'
       value.should == 'asdf'
     end
 
     it "should check for a helper method to call" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_index_field).and_return('custom asdf value')
       value = helper.render_index_field_value :document => doc, :field => 'asdf'
       value.should == 'custom asdf value'
     end
 
+    it "should gracefully handle when no highlight field is available" do
+      doc = double()
+      doc.should_not_receive(:get)
+      doc.should_receive(:has_highlight_field?).and_return(false)
+      value = helper.render_index_field_value :document => doc, :field => 'highlight'
+      value.should be_blank
+    end
+
     it "should check for a highlighted field" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get)
+      doc.should_receive(:has_highlight_field?).and_return(true)
       doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_index_field_value :document => doc, :field => 'highlight'
       value.should == '<em>highlight</em>'
     end
 
     it "should check the document field value" do
-      doc = mock()
+      doc = double()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_index_field_value :document => doc, :field => 'qwer'
       value.should == 'document qwer value'
     end
 
     it "should work with index fields that aren't explicitly defined" do
-      doc = mock()
+      doc = double()
       doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_index_field_value :document => doc, :field => 'mnbv'
       value.should == 'document mnbv value'
@@ -538,7 +543,7 @@ describe BlacklightHelper do
     end
 
     it "should check for an explicit value" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.should_not_receive(:render_asdf_document_show_field)
       value = helper.render_document_show_field_value :value => 'asdf', :document => doc, :field => 'asdf'
@@ -546,17 +551,25 @@ describe BlacklightHelper do
     end
 
     it "should check for a helper method to call" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_document_show_field).and_return('custom asdf value')
       value = helper.render_document_show_field_value :document => doc, :field => 'asdf'
       value.should == 'custom asdf value'
     end
 
+    it "should gracefully handle when no highlight field is available" do
+      doc = double()
+      doc.should_not_receive(:get)
+      doc.should_receive(:has_highlight_field?).and_return(false)
+      value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
+      value.should be_blank
+    end
 
     it "should check for a highlighted field" do
-      doc = mock()
+      doc = double()
       doc.should_not_receive(:get)
+      doc.should_receive(:has_highlight_field?).and_return(true)
       doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
       value.should == '<em>highlight</em>'
@@ -564,14 +577,14 @@ describe BlacklightHelper do
 
 
     it "should check the document field value" do
-      doc = mock()
+      doc = double()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_document_show_field_value :document => doc, :field => 'qwer'
       value.should == 'document qwer value'
     end
 
     it "should work with show fields that aren't explicitly defined" do
-      doc = mock()
+      doc = double()
       doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_document_show_field_value :document => doc, :field => 'mnbv'
       value.should == 'document mnbv value'
@@ -580,17 +593,17 @@ describe BlacklightHelper do
 
   describe "#should_render_index_field?" do
     it "should if the document has the field value" do
-      doc = mock()
+      doc = double()
       doc.stub(:has?).with('asdf').and_return(true)
-      field_config = mock(:field => 'asdf')
+      field_config = double(:field => 'asdf')
       helper.should_render_index_field?(doc, field_config).should == true
     end
 
     it "should if the document has a highlight field value" do
-      doc = mock()
+      doc = double()
       doc.stub(:has?).with('asdf').and_return(false)
       doc.stub(:has_highlight_field?).with('asdf').and_return(true)
-      field_config = mock(:field => 'asdf', :highlight => true)
+      field_config = double(:field => 'asdf', :highlight => true)
       helper.should_render_index_field?(doc, field_config).should == true
     end
   end
@@ -598,17 +611,17 @@ describe BlacklightHelper do
 
   describe "#should_render_show_field?" do
     it "should if the document has the field value" do
-      doc = mock()
+      doc = double()
       doc.stub(:has?).with('asdf').and_return(true)
-      field_config = mock(:field => 'asdf')
+      field_config = double(:field => 'asdf')
       helper.should_render_show_field?(doc, field_config).should == true
     end
 
     it "should if the document has a highlight field value" do
-      doc = mock()
+      doc = double()
       doc.stub(:has?).with('asdf').and_return(false)
       doc.stub(:has_highlight_field?).with('asdf').and_return(true)
-      field_config = mock(:field => 'asdf', :highlight => true)
+      field_config = double(:field => 'asdf', :highlight => true)
       helper.should_render_show_field?(doc, field_config).should == true
     end
   end

data/spec/helpers/catalog_helper_spec.rb

@@ -10,11 +10,11 @@ describe CatalogHelper do
     total = args[:total]
     start = (current_page - 1) * per_page
 
-    mock_response = mock("Blacklight::SolrResponse")
-    mock_response.stub!(:total).and_return(total)
-    mock_response.stub!(:rows).and_return(per_page)
-    mock_response.stub!(:start).and_return(start)
-    mock_response.stub!(:docs).and_return((1..total).to_a.slice(start, per_page))
+    mock_response = double("Blacklight::SolrResponse")
+    mock_response.stub(:total).and_return(total)
+    mock_response.stub(:rows).and_return(per_page)
+    mock_response.stub(:start).and_return(start)
+    mock_response.stub(:docs).and_return((1..total).to_a.slice(start, per_page))
 
     mock_response
   end

data/spec/helpers/facets_helper_spec.rb

@@ -9,9 +9,9 @@ describe FacetsHelper do
   describe "has_facet_values?" do
     it "should be true if there are any facets to display" do
 
-      a = mock(:items => [1,2])
-      b = mock(:items => ['b','c'])
-      empty = mock(:items => [])
+      a = double(:items => [1,2])
+      b = double(:items => ['b','c'])
+      empty = double(:items => [])
 
       fields = [a,b,empty]
       helper.has_facet_values?(fields).should be_true
@@ -19,7 +19,7 @@ describe FacetsHelper do
 
     it "should be false if all facets are empty" do
 
-      empty = mock(:items => [])
+      empty = double(:items => [])
 
       fields = [empty]
       helper.has_facet_values?(fields).should_not be_true
@@ -36,34 +36,34 @@ describe FacetsHelper do
       helper.stub(:blacklight_config => @config)
     end
     it "should render facets with items" do
-      a = mock(:items => [1,2], :name=>'basic_field')
+      a = double(:items => [1,2], :name=>'basic_field')
       helper.should_render_facet?(a).should == true
     end
     it "should not render facets without items" do
-      empty = mock(:items => [], :name=>'basic_field')
+      empty = double(:items => [], :name=>'basic_field')
       helper.should_render_facet?(empty).should ==  false
     end
 
     it "should not render facets where show is set to false" do
-      a = mock(:items => [1,2], :name=>'no_show')
+      a = double(:items => [1,2], :name=>'no_show')
       helper.should_render_facet?(a).should ==  false
     end
   end
 
   describe "facet_by_field_name" do
     it "should retrieve the facet from the response given a string" do
-      facet_config = mock(:query => nil)
-      facet_field = mock()
+      facet_config = double(:query => nil)
+      facet_field = double()
       helper.should_receive(:facet_configuration_for_field).with(anything()).and_return(facet_config)
 
-      @response = mock()
+      @response = double()
       @response.should_receive(:facet_by_field_name).with('a').and_return(facet_field)
 
       helper.facet_by_field_name('a').should == facet_field
     end
 
     it "should also work for facet query fields" do
-      facet_config = mock(:query => {})
+      facet_config = double(:query => {})
       helper.should_receive(:facet_configuration_for_field).with('a_query_facet_field').and_return(facet_config)
       helper.should_receive(:create_rsolr_facet_field_response_for_query_facet_field).with('a_query_facet_field', facet_config)
 
@@ -72,7 +72,7 @@ describe FacetsHelper do
 
     describe "query facets" do
       let(:facet_config) { 
-        mock(
+        double(
           :query => {
              'a_simple_query' => { :fq => 'field:search', :label => 'A Human Readable label'},
              'another_query' => { :fq => 'field:different_search', :label => 'Label'},
@@ -84,7 +84,7 @@ describe FacetsHelper do
       before(:each) do
         helper.should_receive(:facet_configuration_for_field).with(anything()).and_return(facet_config)
 
-        @response = mock(:facet_queries => {
+        @response = double(:facet_queries => {
           'field:search' => 10,
           'field:different_search' => 2,
           'field:not_appearing_in_the_config' => 50,
@@ -92,7 +92,7 @@ describe FacetsHelper do
         })
       end
 
-      it"should convert the query facets into a mock RSolr FacetField" do
+      it"should convert the query facets into a double RSolr FacetField" do
         field = helper.facet_by_field_name('my_query_facet_field')
         field.should be_a_kind_of Blacklight::SolrResponse::Facets::FacetField
 
@@ -110,16 +110,16 @@ describe FacetsHelper do
 
     describe "pivot facets" do
       let(:facet_config) {
-        mock(:pivot => ['field_a', 'field_b'])
+        double(:pivot => ['field_a', 'field_b'])
       }
 
       before(:each) do 
         helper.should_receive(:facet_configuration_for_field).with(anything()).and_return(facet_config)
       
-        @response = mock(:facet_pivot => { 'field_a,field_b' => [{:field => 'field_a', :value => 'a', :count => 10, :pivot => [{:field => 'field_b', :value => 'b', :count => 2}]}]})
+        @response = double(:facet_pivot => { 'field_a,field_b' => [{:field => 'field_a', :value => 'a', :count => 10, :pivot => [{:field => 'field_b', :value => 'b', :count => 2}]}]})
       end
 
-      it "should convert the pivot facet into a mock RSolr FacetField" do
+      it "should convert the pivot facet into a double RSolr FacetField" do
         field = helper.facet_by_field_name('my_pivot_facet_field')
         field.should be_a_kind_of Blacklight::SolrResponse::Facets::FacetField
 
@@ -138,9 +138,9 @@ describe FacetsHelper do
 
   describe "render_facet_partials" do
     it "should try to render all provided facets " do
-      a = mock(:items => [1,2])
-      b = mock(:items => ['b','c'])
-      empty = mock(:items => [])
+      a = double(:items => [1,2])
+      b = double(:items => ['b','c'])
+      empty = double(:items => [])
 
       fields = [a,b,empty]
 
@@ -152,8 +152,8 @@ describe FacetsHelper do
     end
 
     it "should default to the configured facets" do
-      a = mock(:items => [1,2])
-      b = mock(:items => ['b','c'])
+      a = double(:items => [1,2])
+      b = double(:items => ['b','c'])
       helper.should_receive(:facet_field_names) { [a,b] }
 
       helper.should_receive(:render_facet_limit).with(a, {})
@@ -175,11 +175,11 @@ describe FacetsHelper do
       end
 
       helper.stub(:blacklight_config => @config)
-      @response = mock()
+      @response = double()
     end
 
     it "should set basic local variables" do
-      @mock_facet = mock(:name => 'basic_field', :items => [1,2,3])
+      @mock_facet = double(:name => 'basic_field', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit', 
                                                          :locals => { 
                                                             :solr_field => 'basic_field', 
@@ -197,37 +197,37 @@ describe FacetsHelper do
     end
 
     it "should render a facet _not_ declared in the configuration" do
-      @mock_facet = mock(:name => 'asdf', :items => [1,2,3])
+      @mock_facet = double(:name => 'asdf', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit'))
       helper.render_facet_limit(@mock_facet)
     end
 
     it "should get the partial name from the configuration" do
-      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
+      @mock_facet = double(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
       helper.render_facet_limit(@mock_facet)
     end 
 
     it "should use a partial layout for rendering the facet frame" do
-      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
+      @mock_facet = double(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:layout => 'facet_layout'))
       helper.render_facet_limit(@mock_facet)
     end
 
     it "should allow the caller to opt-out of facet layouts" do
-      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
+      @mock_facet = double(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:layout => nil))
       helper.render_facet_limit(@mock_facet, :layout => nil)
     end
 
     it "should render the facet_pivot partial for pivot facets" do
-      @mock_facet = mock(:name => 'pivot_facet_field', :items => [1,2,3])
+      @mock_facet = double(:name => 'pivot_facet_field', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_pivot'))
       helper.render_facet_limit(@mock_facet)
     end 
 
     it "should let you override the rendered partial for pivot facets" do
-      @mock_facet = mock(:name => 'my_pivot_facet_field_with_custom_partial', :items => [1,2,3])
+      @mock_facet = double(:name => 'my_pivot_facet_field_with_custom_partial', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
       helper.render_facet_limit(@mock_facet)
     end 
@@ -240,7 +240,7 @@ describe FacetsHelper do
     end
 
     it "should add facet value for no pre-existing facets" do
-      helper.stub!(:params).and_return(@params_no_existing_facet)
+      helper.stub(:params).and_return(@params_no_existing_facet)
 
       result_params = helper.add_facet_params("facet_field", "facet_value")
       result_params[:f].should be_a_kind_of(Hash)
@@ -249,7 +249,7 @@ describe FacetsHelper do
     end
 
     it "should add a facet param to existing facet constraints" do
-      helper.stub!(:params).and_return(@params_existing_facets)
+      helper.stub(:params).and_return(@params_existing_facets)
       
       result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
 
@@ -267,7 +267,7 @@ describe FacetsHelper do
     end
     it "should leave non-facet params alone" do
       [@params_existing_facets, @params_no_existing_facet].each do |params|
-        helper.stub!(:params).and_return(params)
+        helper.stub(:params).and_return(params)
 
         result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
 
@@ -279,9 +279,9 @@ describe FacetsHelper do
     end    
 
     it "should replace facets for facets configured as single" do
-      helper.should_receive(:facet_configuration_for_field).with('single_value_facet_field').and_return(mock(:single => true))
+      helper.should_receive(:facet_configuration_for_field).with('single_value_facet_field').and_return(double(:single => true))
       params = { :f => { 'single_value_facet_field' => 'other_value'}}
-      helper.stub!(:params).and_return params
+      helper.stub(:params).and_return params
 
       result_params = helper.add_facet_params('single_value_facet_field', 'my_value')
 
@@ -292,14 +292,14 @@ describe FacetsHelper do
 
     it "should accept a FacetItem instead of a plain facet value" do
           
-      result_params = helper.add_facet_params('facet_field_1', mock(:value => 123))
+      result_params = helper.add_facet_params('facet_field_1', double(:value => 123))
 
       result_params[:f]['facet_field_1'].should include(123)
     end
 
     it "should defer to the field set on a FacetItem" do
           
-      result_params = helper.add_facet_params('facet_field_1', mock(:field => 'facet_field_2', :value => 123))
+      result_params = helper.add_facet_params('facet_field_1', double(:field => 'facet_field_2', :value => 123))
 
       result_params[:f]['facet_field_1'].should be_blank
       result_params[:f]['facet_field_2'].should include(123)
@@ -307,7 +307,7 @@ describe FacetsHelper do
 
     it "should add any extra fq parameters from the FacetItem" do
           
-      result_params = helper.add_facet_params('facet_field_1', mock(:value => 123, :fq => {'facet_field_2' => 'abc'}))
+      result_params = helper.add_facet_params('facet_field_1', double(:value => 123, :fq => {'facet_field_2' => 'abc'}))
 
       result_params[:f]['facet_field_1'].should include(123)
       result_params[:f]['facet_field_2'].should include('abc')
@@ -325,7 +325,7 @@ describe FacetsHelper do
                 Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
                 :id => 'facet_field_name'
       }
-      helper.stub!(:params).and_return(catalog_facet_params)
+      helper.stub(:params).and_return(catalog_facet_params)
     end
     it "should redirect to 'index' action" do
       params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
@@ -366,31 +366,31 @@ describe FacetsHelper do
 
   describe "render_facet_value" do
     it "should use facet_display_value" do
-      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(double(:query => nil, :date => nil, :helper_method => nil, :single => false))
  
       helper.should_receive(:facet_display_value).and_return('Z')
       helper.should_receive(:add_facet_params_and_redirect).and_return('link')
-      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10)).should == (helper.link_to("Z", "link", :class => "facet_select") + " " + (helper.content_tag :span, 10, :class => 'count')).html_safe
+      helper.render_facet_value('simple_field', double(:value => 'A', :hits => 10)).should == (helper.link_to("Z", "link", :class => "facet_select") + " " + (helper.content_tag :span, 10, :class => 'count')).html_safe
     end
 
 
     it "should suppress the link" do
-      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(double(:query => nil, :date => nil, :helper_method => nil, :single => false))
  
       helper.should_receive(:facet_display_value).and_return('Z')
       helper.should_receive(:add_facet_params_and_redirect).and_return('link')
-      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10), :suppress_link => true).should == "Z <span class=\"count\">10</span>"
+      helper.render_facet_value('simple_field', double(:value => 'A', :hits => 10), :suppress_link => true).should == "Z <span class=\"count\">10</span>"
     end
   end
  
   describe "#facet_display_value" do
     it "should just be the facet value for an ordinary facet" do
-      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil))
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(double(:query => nil, :date => nil, :helper_method => nil))
       helper.facet_display_value('simple_field', 'asdf').should == 'asdf'
     end
 
     it "should allow you to pass in a :helper_method argument to the configuration" do
-      helper.stub(:facet_configuration_for_field).with('helper_field').and_return(mock(:query => nil, :date => nil, :helper_method => :my_facet_value_renderer))
+      helper.stub(:facet_configuration_for_field).with('helper_field').and_return(double(:query => nil, :date => nil, :helper_method => :my_facet_value_renderer))
     
       helper.should_receive(:my_facet_value_renderer).with('qwerty').and_return('abc')
 
@@ -398,17 +398,17 @@ describe FacetsHelper do
     end
 
     it "should extract the configuration label for a query facet" do
-      helper.stub(:facet_configuration_for_field).with('query_facet').and_return(mock(:query => { 'query_key' => { :label => 'XYZ'}}, :date => nil, :helper_method => nil))
+      helper.stub(:facet_configuration_for_field).with('query_facet').and_return(double(:query => { 'query_key' => { :label => 'XYZ'}}, :date => nil, :helper_method => nil))
       helper.facet_display_value('query_facet', 'query_key').should == 'XYZ'
     end
 
     it "should localize the label for date-type facets" do
-      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => true, :query => nil, :helper_method => nil))
+      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(double('date' => true, :query => nil, :helper_method => nil))
       helper.facet_display_value('date_facet', '2012-01-01').should == 'Sun, 01 Jan 2012 00:00:00 +0000'
     end
 
     it "should localize the label for date-type facets with the supplied localization options" do
-      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => { :format => :short }, :query => nil, :helper_method => nil))
+      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(double('date' => { :format => :short }, :query => nil, :helper_method => nil))
       helper.facet_display_value('date_facet', '2012-01-01').should == '01 Jan 00:00'
     end
   end