blacklight 5.0.0.pre1 → 5.0.0.pre2

data/spec/helpers/catalog_helper_spec.rb

@@ -1,5 +1,5 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+
 describe CatalogHelper do
   include ERB::Util
   include CatalogHelper
@@ -31,16 +31,16 @@ describe CatalogHelper do
       @response = mock_response :total => 0
 
       html = page_entries_info(@response, { :entry_name => 'entry_name' })
-      html.should == "No entry_names found"
-      html.html_safe?.should == true
+      expect(html).to eq "No entry_names found"
+      expect(html).to be_html_safe
     end
 
     it "with no results (and no entry_name provided)" do
       @response = mock_response :total => 0
 
       html = page_entries_info(@response)
-      html.should == "No entries found"
-      html.html_safe?.should == true
+      expect(html).to eq "No entries found"
+      expect(html).to be_html_safe
     end
 
     describe "with a single result" do
@@ -48,21 +48,21 @@ describe CatalogHelper do
         response = mock_response :total => 1
 
         html = page_entries_info(response, { :entry_name => 'entry_name' })
-        html.should == "<strong>1</strong> entry_name found"
-        html.html_safe?.should == true
+        expect(html).to eq "<strong>1</strong> entry_name found"
+        expect(html).to be_html_safe
       end
 
       it "should infer a name" do
         response = mock_response :total => 1
 
         html = page_entries_info(response)
-        html.should == "<strong>1</strong> entry found"
-        html.html_safe?.should == true
+        expect(html).to eq "<strong>1</strong> entry found"
+        expect(html).to be_html_safe
       end
 
       it "should use the model_name from the response" do
         response = mock_response :total => 1
-        response.stub(:model_name).and_return('thingy')
+        response.stub(:model_name).and_return(double(:human => 'thingy'))
 
         html = page_entries_info(response)
         expect(html).to eq "<strong>1</strong> thingy found"
@@ -74,39 +74,52 @@ describe CatalogHelper do
       response = mock_response :total => 7
 
       html = page_entries_info(response, { :entry_name => 'entry_name' })
-      html.should == "<strong>1</strong> - <strong>7</strong> of <strong>7</strong>"
-      html.html_safe?.should == true
+      expect(html).to eq "<strong>1</strong> - <strong>7</strong> of <strong>7</strong>"
+      expect(html).to be_html_safe
     end
 
     it "on the first page of multiple pages of results" do
       @response = mock_response :total => 15, :per_page => 10
 
       html = page_entries_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<strong>1</strong> - <strong>10</strong> of <strong>15</strong>"
-      html.html_safe?.should == true
+      expect(html).to eq "<strong>1</strong> - <strong>10</strong> of <strong>15</strong>"
+      expect(html).to be_html_safe
     end
 
     it "on the second page of multiple pages of results" do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 2
 
       html = page_entries_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<strong>11</strong> - <strong>20</strong> of <strong>47</strong>"
-      html.html_safe?.should == true
+      expect(html).to eq "<strong>11</strong> - <strong>20</strong> of <strong>47</strong>"
+      expect(html).to be_html_safe
     end
 
     it "on the last page of results" do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 5
 
       html = page_entries_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<strong>41</strong> - <strong>47</strong> of <strong>47</strong>"
-      html.html_safe?.should == true
+      expect(html).to eq "<strong>41</strong> - <strong>47</strong> of <strong>47</strong>"
+      expect(html).to be_html_safe
     end
     it "should work with rows the same as per_page" do
       @response = mock_response :total => 47, :rows => 20, :current_page => 2
 
       html = page_entries_info(@response, { :entry_name => 'entry_name' })
-      html.should == "<strong>21</strong> - <strong>40</strong> of <strong>47</strong>"
-      html.html_safe?.should == true
+      expect(html).to eq "<strong>21</strong> - <strong>40</strong> of <strong>47</strong>"
+      expect(html).to be_html_safe
+    end
+
+    it "uses delimiters with large numbers" do
+      @response = mock_response :total => 5000, :rows => 10, :current_page => 101
+      html = page_entries_info(@response, { :entry_name => 'entry_name' })
+
+      expect(html).to eq "<strong>1,001</strong> - <strong>1,010</strong> of <strong>5,000</strong>"
+    end
+
+    it "should work with an activerecord collection" do
+      50.times { b = Bookmark.new;  b.user_id = 1; b.save! }
+      html = helper.page_entries_info(Bookmark.page(1).per(25))
+      expect(html).to eq "<strong>1</strong> - <strong>25</strong> of <strong>50</strong>"
     end
 
   end

data/spec/helpers/facets_helper_spec.rb

@@ -17,7 +17,7 @@ describe FacetsHelper do
       empty = double(:items => [])
 
       fields = [a,b,empty]
-      helper.has_facet_values?(fields).should be_true
+      expect(helper.has_facet_values?(fields)).to be_true
     end
 
     it "should be false if all facets are empty" do
@@ -25,7 +25,7 @@ describe FacetsHelper do
       empty = double(:items => [])
 
       fields = [empty]
-      helper.has_facet_values?(fields).should_not be_true
+      expect(helper.has_facet_values?(fields)).to be_false
     end
   end
 
@@ -40,16 +40,16 @@ describe FacetsHelper do
     end
     it "should render facets with items" do
       a = double(:items => [1,2], :name=>'basic_field')
-      helper.should_render_facet?(a).should == true
+      expect(helper.should_render_facet?(a)).to be_true
     end
     it "should not render facets without items" do
       empty = double(:items => [], :name=>'basic_field')
-      helper.should_render_facet?(empty).should ==  false
+      expect(helper.should_render_facet?(empty)).to be_false
     end
 
     it "should not render facets where show is set to false" do
       a = double(:items => [1,2], :name=>'no_show')
-      helper.should_render_facet?(a).should ==  false
+      expect(helper.should_render_facet?(a)).to be_false
     end
   end
 
@@ -62,7 +62,7 @@ describe FacetsHelper do
       @response = double()
       @response.should_receive(:facet_by_field_name).with('a').and_return(facet_field)
 
-      helper.facet_by_field_name('a').should == facet_field
+      expect(helper.facet_by_field_name('a')).to eq facet_field
     end
 
     it "should also work for facet query fields" do
@@ -99,15 +99,15 @@ describe FacetsHelper do
         field = helper.facet_by_field_name('my_query_facet_field')
         field.should be_a_kind_of Blacklight::SolrResponse::Facets::FacetField
 
-        field.name.should == 'my_query_facet_field'
-        field.items.length.should == 2
-        field.items.map { |x| x.value }.should_not include 'field:not_appearing_in_the_config'
+        expect(field.name).to eq'my_query_facet_field'
+        expect(field.items).to have(2).items
+        expect(field.items.map { |x| x.value }).to_not include 'field:not_appearing_in_the_config'
 
         facet_item = field.items.select { |x| x.value == 'a_simple_query' }.first
 
-        facet_item.value.should == 'a_simple_query'
-        facet_item.hits.should == 10
-        facet_item.label.should == 'A Human Readable label'
+        expect(facet_item.value).to eq 'a_simple_query'
+        expect(facet_item.hits).to eq 10
+        expect(facet_item.label).to eq 'A Human Readable label'
       end
     end
 
@@ -126,14 +126,14 @@ describe FacetsHelper do
         field = helper.facet_by_field_name('my_pivot_facet_field')
         field.should be_a_kind_of Blacklight::SolrResponse::Facets::FacetField
 
-        field.name.should == 'my_pivot_facet_field'
+        expect(field.name).to eq 'my_pivot_facet_field'
 
-        field.items.length.should == 1
+        expect(field.items).to have(1).item
 
-        field.items.first.should respond_to(:items)
+        expect(field.items.first).to respond_to(:items)
 
-        field.items.first.items.length.should == 1
-        field.items.first.items.first.fq.should == { 'field_a' => 'a' }
+        expect(field.items.first.items).to have(1).item
+        expect(field.items.first.items.first.fq).to eq({ 'field_a' => 'a' })
       end
     end
   end
@@ -239,9 +239,9 @@ describe FacetsHelper do
       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)
-      result_params[:f]["facet_field"].should be_a_kind_of(Array)
-      result_params[:f]["facet_field"].should == ["facet_value"]
+      expect(result_params[:f]).to be_a_kind_of(Hash)
+      expect(result_params[:f]["facet_field"]).to be_a_kind_of(Array)
+      expect(result_params[:f]["facet_field"]).to eq ["facet_value"]
     end
 
     it "should add a facet param to existing facet constraints" do
@@ -249,15 +249,15 @@ describe FacetsHelper do
       
       result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
 
-      result_params[:f].should be_a_kind_of(Hash)
+      expect(result_params[:f]).to be_a_kind_of(Hash)
 
       @params_existing_facets[:f].each_pair do |facet_field, value_list|
-        result_params[:f][facet_field].should be_a_kind_of(Array)
+        expect(result_params[:f][facet_field]).to be_a_kind_of(Array)
         
         if facet_field == 'facet_field_2'
-          result_params[:f][facet_field].should == (@params_existing_facets[:f][facet_field] | ["new_facet_value"])
+          expect(result_params[:f][facet_field]).to eq (@params_existing_facets[:f][facet_field] | ["new_facet_value"])
         else
-          result_params[:f][facet_field].should ==  @params_existing_facets[:f][facet_field]
+          expect(result_params[:f][facet_field]).to eq @params_existing_facets[:f][facet_field]
         end        
       end
     end
@@ -269,7 +269,7 @@ describe FacetsHelper do
 
         params.each_pair do |key, value|
           next if key == :f
-          result_params[key].should == params[key]
+          expect(result_params[key]).to eq params[key]
         end        
       end
     end    
@@ -282,31 +282,31 @@ describe FacetsHelper do
       result_params = helper.add_facet_params('single_value_facet_field', 'my_value')
 
 
-      result_params[:f]['single_value_facet_field'].length.should == 1
-      result_params[:f]['single_value_facet_field'].first.should == 'my_value'
+      expect(result_params[:f]['single_value_facet_field']).to have(1).item
+      expect(result_params[:f]['single_value_facet_field'].first).to eq 'my_value'
     end
 
     it "should accept a FacetItem instead of a plain facet value" do
           
       result_params = helper.add_facet_params('facet_field_1', double(:value => 123))
 
-      result_params[:f]['facet_field_1'].should include(123)
+      expect(result_params[:f]['facet_field_1']).to include(123)
     end
 
     it "should defer to the field set on a FacetItem" do
           
       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)
+      expect(result_params[:f]['facet_field_1']).to be_blank
+      expect(result_params[:f]['facet_field_2']).to include(123)
     end
 
     it "should add any extra fq parameters from the FacetItem" do
           
       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')
+      expect(result_params[:f]['facet_field_1']).to include(123)
+      expect(result_params[:f]['facet_field_2']).to include('abc')
     end
   end
 
@@ -326,20 +326,20 @@ describe FacetsHelper do
     it "should redirect to 'index' action" do
       params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
 
-      params[:action].should == "index"
+      expect(params[:action]).to eq "index"
     end
     it "should not include request parameters used by the facet paginator" do
       params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
 
       bad_keys = Blacklight::Solr::FacetPaginator.request_keys.values + [:id]
       bad_keys.each do |paginator_key|
-        params.keys.should_not include(paginator_key)        
+        expect(params.keys).to_not include(paginator_key)        
       end
     end
     it 'should remove :page request key' do
       params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
 
-      params.keys.should_not include(:page)
+      expect(params.keys).to_not include(:page)
     end
     it "should otherwise do the same thing as add_facet_params" do
       added_facet_params = helper.add_facet_params("facet_field_2", "facet_value")
@@ -347,7 +347,7 @@ describe FacetsHelper do
 
       added_facet_params_from_facet_action.each_pair do |key, value|
         next if key == :action
-        value.should == added_facet_params[key]
+        expect(value).to eq added_facet_params[key]
       end      
     end
   end
@@ -406,7 +406,7 @@ describe FacetsHelper do
   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(double(:query => nil, :date => nil, :helper_method => nil))
-      helper.facet_display_value('simple_field', 'asdf').should == 'asdf'
+      expect(helper.facet_display_value('simple_field', 'asdf')).to eq 'asdf'
     end
 
     it "should allow you to pass in a :helper_method argument to the configuration" do
@@ -414,22 +414,22 @@ describe FacetsHelper do
     
       helper.should_receive(:my_facet_value_renderer).with('qwerty').and_return('abc')
 
-      helper.facet_display_value('helper_field', 'qwerty').should == 'abc'
+      expect(helper.facet_display_value('helper_field', 'qwerty')).to eq 'abc'
     end
 
     it "should extract the configuration label for a query facet" do
       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'
+      expect(helper.facet_display_value('query_facet', 'query_key')).to eq 'XYZ'
     end
 
     it "should localize the label for date-type facets" do
       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'
+      expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq '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(double('date' => { :format => :short }, :query => nil, :helper_method => nil))
-      helper.facet_display_value('date_facet', '2012-01-01').should == '01 Jan 00:00'
+      expect(helper.facet_display_value('date_facet', '2012-01-01')).to eq '01 Jan 00:00'
     end
   end
 end

data/spec/helpers/hash_as_hidden_fields_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe HashAsHiddenFieldsHelper do
   include HashAsHiddenFieldsHelper
@@ -11,13 +10,13 @@ describe HashAsHiddenFieldsHelper do
 
     generated = hash_as_hidden_fields(@hash)
 
-    generated.should have_selector("input[type='hidden'][name='q'][value='query']")
-    generated.should have_selector("input[type='hidden'][name='per_page'][value='10']")
-    generated.should have_selector("input[type='hidden'][name='page'][value='5']")
-    generated.should have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']")
-    generated.should have_selector("input[type='hidden'][name='f[field2][]'][value='z']")
-    generated.should have_selector("input[type='hidden'][name='f[field1][]'][value='a']")
-    generated.should have_selector("input[type='hidden'][name='f[field1][]'][value='b']")
+    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']")
+    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']")
+    expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']")
+    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']")
+    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']")
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']")
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']")
     
   end
 

data/spec/helpers/render_constraints_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe RenderConstraintsHelper do
 
@@ -9,7 +9,7 @@ describe RenderConstraintsHelper do
 
   describe '#render_constraints_query' do
     it "should have a link relative to the current url" do
-      helper.render_constraints_query(:q=>'foobar', :f=>{:type=>'journal'}).should have_selector "a[href='/?f%5Btype%5D=journal']"
+      expect(helper.render_constraints_query(:q=>'foobar', :f=>{:type=>'journal'})).to have_selector "a[href='/?f%5Btype%5D=journal']"
     end
   end
 
@@ -23,7 +23,7 @@ describe RenderConstraintsHelper do
     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.
-      result.should have_selector "a[href='/?&q=biz']"
+      expect(result).to have_selector "a[href='/?&q=biz']"
     end
   end
 

data/spec/helpers/search_history_constraints_helper_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe SearchHistoryConstraintsHelper do
 
@@ -21,10 +20,10 @@ describe SearchHistoryConstraintsHelper do
       it "should render basic element" do
         response = helper.render_search_to_s_element("key", "value")
         response.should have_selector("span.constraint")  do |span|
-          span.should have_selector("span.filterName", :content => "key:")
-          span.should have_selector("span.filterValue", :content => "value")
+          expect(span).to have_selector("span.filterName", :content => "key:")
+          expect(span).to have_selector("span.filterValue", :content => "value")
         end
-        response.html_safe?.should == true
+        expect(response).to be_html_safe
       end
       it "should escape them that need escaping" do
         response = helper.render_search_to_s_element("key>", "value>")
@@ -33,21 +32,21 @@ describe SearchHistoryConstraintsHelper do
             # Note: nokogiri's gettext will unescape the inner html
             # which seems to be what rspecs "contains" method calls on 
             # text nodes - thus the to_s inserted below.
-            s2.to_s.should match(/key>:/)
+            expect(s2).to match(/key>:/)
           end
           span.should have_selector("span.filterValue") do |s3|            
-            s3.to_s.should match(/value>/)
+            expect(s3).to match(/value>/)
           end
         end
-        response.html_safe?.should == true
+        expect(response).to be_html_safe
       end
       it "should not escape with options set thus" do
         response = helper.render_search_to_s_element("key>", "value>", :escape_key => false, :escape_value => false)
         response.should have_selector("span.constraint") do |span|
-          span.should have_selector("span.filterName", :content => "key>:")
-          span.should have_selector("span.filterValue", :content => "value>")
+          expect(span).to have_selector("span.filterName", :content => "key>:")
+          expect(span).to have_selector("span.filterValue", :content => "value>")
         end
-        response.html_safe?.should == true
+        expect(response).to be_html_safe
       end
     end
 
@@ -62,9 +61,9 @@ describe SearchHistoryConstraintsHelper do
         # API hooks expect this to be so
         response = helper.render_search_to_s(@params)
 
-        response.should include( helper.render_search_to_s_q(@params))
-        response.should include( helper.render_search_to_s_filters(@params))
-        response.html_safe?.should == true
+        expect(response).to include( helper.render_search_to_s_q(@params))
+        expect(response).to include( helper.render_search_to_s_filters(@params))
+        expect(response).to be_html_safe
       end
     end