sunspot 2.2.7 → 2.5.0

data/spec/api/search/faceting_spec.rb

@@ -6,7 +6,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :title
     end
-    result.facet(:title).field_name.should == :title
+    expect(result.facet(:title).field_name).to eq(:title)
   end
 
   it 'returns facet specified by string' do
@@ -14,7 +14,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :title
     end
-    result.facet('title').field_name.should == :title
+    expect(result.facet('title').field_name).to eq(:title)
   end
 
   it 'returns all facets specified by search' do
@@ -24,8 +24,8 @@ describe 'faceting', :type => :search do
       facet :title
       facet :blog_id
     end
-    result.facets.first.field_name.should == :title
-    result.facets.last.field_name.should == :blog_id
+    expect(result.facets.first.field_name).to eq(:title)
+    expect(result.facets.last.field_name).to eq(:blog_id)
   end
 
   it 'returns string facet' do
@@ -33,7 +33,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :title
     end
-    facet_values(result, :title).should == ['Author 1', 'Author 2']
+    expect(facet_values(result, :title)).to eq(['Author 1', 'Author 2'])
   end
 
   it 'returns counts for facet' do
@@ -41,7 +41,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :title
     end
-    facet_counts(result, :title).should == [2, 1]
+    expect(facet_counts(result, :title)).to eq([2, 1])
   end
 
   it 'returns integer facet' do
@@ -49,7 +49,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :blog_id
     end
-    facet_values(result, :blog_id).should == [3, 1]
+    expect(facet_values(result, :blog_id)).to eq([3, 1])
   end
 
   it 'returns float facet' do
@@ -57,7 +57,7 @@ describe 'faceting', :type => :search do
     result = session.search Post do
       facet :average_rating
     end
-    facet_values(result, :average_rating).should == [9.3, 1.1]
+    expect(facet_values(result, :average_rating)).to eq([9.3, 1.1])
   end
 
   it 'returns time facet' do
@@ -77,10 +77,11 @@ describe 'faceting', :type => :search do
       rescue ArgumentError
         DateTime.civil(2050, 4, 7, 20, 27, 15)
       end
-    facet_values(result, :published_at).should ==
+    expect(facet_values(result, :published_at)).to eq(
       [Time.gm(2009, 4, 7, 20, 25, 23),
        Time.gm(2009, 4, 7, 20, 26, 19),
        future_time]
+    )
   end
 
   it 'returns date facet' do
@@ -92,9 +93,10 @@ describe 'faceting', :type => :search do
     result = session.search(Post) do
       facet :expire_date
     end
-    facet_values(result, :expire_date).should ==
+    expect(facet_values(result, :expire_date)).to eq(
       [Date.new(2009, 07, 13),
        Date.new(2009, 04, 01)]
+    )
   end
 
   it 'returns trie integer facet' do
@@ -102,7 +104,7 @@ describe 'faceting', :type => :search do
     result = session.search Photo do
       facet :size
     end
-    facet_values(result, :size).should == [3, 1]
+    expect(facet_values(result, :size)).to eq([3, 1])
   end
 
   it 'returns float facet' do
@@ -110,7 +112,7 @@ describe 'faceting', :type => :search do
     result = session.search Photo do
       facet :average_rating
     end
-    facet_values(result, :average_rating).should == [9.3, 1.1]
+    expect(facet_values(result, :average_rating)).to eq([9.3, 1.1])
   end
 
   it 'returns time facet' do
@@ -122,15 +124,16 @@ describe 'faceting', :type => :search do
     result = session.search Photo do
       facet :created_at
     end
-    facet_values(result, :created_at).should ==
+    expect(facet_values(result, :created_at)).to eq(
       [Time.gm(2009, 04, 07, 20, 25, 23),
        Time.gm(2009, 04, 07, 20, 26, 19)]
+    )
   end
 
   it 'returns boolean facet' do
     stub_facet(:featured_bs, 'true' => 3, 'false' => 1)
     result = session.search(Post) { facet(:featured) }
-    facet_values(result, :featured).should == [true, false]
+    expect(facet_values(result, :featured)).to eq([true, false])
   end
 
 
@@ -138,26 +141,26 @@ describe 'faceting', :type => :search do
     it "returns field facet with #{type} custom name" do
       stub_facet(:blog, '2' => 1, '1' => 4)
       result = session.search(Post) { facet(:blog_id, :name => name) }
-      facet_values(result, :blog).should == [1, 2]
+      expect(facet_values(result, :blog)).to eq([1, 2])
     end
 
     it "assigns #{type} custom name to field facet" do
       stub_facet(:blog, '2' => 1)
       result = session.search(Post) { facet(:blog_id, :name => name) }
-      result.facet(:blog).name.should == :blog
+      expect(result.facet(:blog).name).to eq(:blog)
     end
 
     it "retains field name for #{type} custom-named field facet" do
       stub_facet(:blog, '2' => 1)
       result = session.search(Post) { facet(:blog_id, :name => name) }
-      result.facet(:blog).field_name.should == :blog_id
+      expect(result.facet(:blog).field_name).to eq(:blog_id)
     end
   end
 
   it 'returns class facet' do
     stub_facet(:class_name, 'Post' => 3, 'Namespaced::Comment' => 1)
     result = session.search(Post) { facet(:class) }
-    facet_values(result, :class).should == [Post, Namespaced::Comment]
+    expect(facet_values(result, :class)).to eq([Post, Namespaced::Comment])
   end
 
   it 'returns special :any facet' do
@@ -166,8 +169,8 @@ describe 'faceting', :type => :search do
     )
     search = session.search(Post) { facet(:category_ids, :extra => :any) }
     row = search.facet(:category_ids).rows.first
-    row.value.should == :any
-    row.count.should == 3
+    expect(row.value).to eq(:any)
+    expect(row.count).to eq(3)
   end
 
   it 'returns special :none facet' do
@@ -176,8 +179,8 @@ describe 'faceting', :type => :search do
     )
     search = session.search(Post) { facet(:category_ids, :extra => :none) }
     row = search.facet(:category_ids).rows.first
-    row.value.should == :none
-    row.count.should == 3
+    expect(row.value).to eq(:none)
+    expect(row.count).to eq(3)
   end
 
   it 'returns date range facet' do
@@ -186,8 +189,8 @@ describe 'faceting', :type => :search do
     end_time = start_time + 2*24*60*60
     result = session.search(Post) { facet(:published_at, :time_range => start_time..end_time) }
     facet = result.facet(:published_at)
-    facet.rows.first.value.should == (start_time..(start_time+24*60*60))
-    facet.rows.last.value.should == ((start_time+24*60*60)..end_time)
+    expect(facet.rows.first.value).to eq(start_time..(start_time+24*60*60))
+    expect(facet.rows.last.value).to eq((start_time+24*60*60)..end_time)
   end
 
   it 'returns date range facet sorted by count' do
@@ -196,8 +199,8 @@ describe 'faceting', :type => :search do
     end_time = start_time + 2*24*60*60
     result = session.search(Post) { facet(:published_at, :time_range => start_time..end_time, :sort => :count) }
     facet = result.facet(:published_at)
-    facet.rows.first.value.should == ((start_time+24*60*60)..end_time)
-    facet.rows.last.value.should == (start_time..(start_time+24*60*60))
+    expect(facet.rows.first.value).to eq((start_time+24*60*60)..end_time)
+    expect(facet.rows.last.value).to eq(start_time..(start_time+24*60*60))
   end
 
   it 'returns query facet' do
@@ -216,10 +219,10 @@ describe 'faceting', :type => :search do
       end
     end
     facet = search.facet(:average_rating)
-    facet.rows.first.value.should == (3.0..5.0)
-    facet.rows.first.count.should == 3
-    facet.rows.last.value.should == (1.0..3.0)
-    facet.rows.last.count.should == 1
+    expect(facet.rows.first.value).to eq(3.0..5.0)
+    expect(facet.rows.first.count).to eq(3)
+    expect(facet.rows.last.value).to eq(1.0..3.0)
+    expect(facet.rows.last.count).to eq(1)
   end
 
   describe 'query facet option handling' do
@@ -244,43 +247,43 @@ describe 'faceting', :type => :search do
     end
 
     it 'sorts in order of specification if no limit is given' do
-      facet_values_from_options.should == [1, 3, 2]
+      expect(facet_values_from_options).to eq([1, 3, 2])
     end
 
     it 'sorts lexically if lexical option is specified' do
-      facet_values_from_options(:sort => :index).should == [1, 2, 3]
+      expect(facet_values_from_options(:sort => :index)).to eq([1, 2, 3])
     end
 
     it 'sorts by count by default if limit is given' do
-      facet_values_from_options(:limit => 2).should == [2, 1]
+      expect(facet_values_from_options(:limit => 2)).to eq([2, 1])
     end
 
     it 'sorts by count if count option is specified' do
-      facet_values_from_options(:sort => :count).should == [2, 1, 3]
+      expect(facet_values_from_options(:sort => :count)).to eq([2, 1, 3])
     end
 
     it 'sorts lexically if lexical option is specified even if limit is given' do
-      facet_values_from_options(:sort => :index, :limit => 2).should == [1, 2]
+      expect(facet_values_from_options(:sort => :index, :limit => 2)).to eq([1, 2])
     end
 
     it 'limits facets if limit option is given' do
-      facet_values_from_options(:limit => 1).should == [2]
+      expect(facet_values_from_options(:limit => 1)).to eq([2])
     end
 
     it 'does not limit facets if limit option is negative' do
-      facet_values_from_options(:limit => -2).should == [1, 3, 2]
+      expect(facet_values_from_options(:limit => -2)).to eq([1, 3, 2])
     end
 
     it 'returns all facets if limit greater than number of facets' do
-      facet_values_from_options(:limit => 10).should == [2, 1, 3]
+      expect(facet_values_from_options(:limit => 10)).to eq([2, 1, 3])
     end
 
     it 'allows zero count if specified' do
-      facet_values_from_options(:zeros => true).should == [1, 3, 2, 4]
+      expect(facet_values_from_options(:zeros => true)).to eq([1, 3, 2, 4])
     end
 
     it 'sets minimum count' do
-      facet_values_from_options(:minimum_count => 2).should == [1, 2]
+      expect(facet_values_from_options(:minimum_count => 2)).to eq([1, 2])
     end
   end
 
@@ -293,17 +296,17 @@ describe 'faceting', :type => :search do
       facet :category_ids, :only => [1, 3, 5]
     end
     facet = search.facet(:category_ids)
-    facet.rows.first.value.should == 1
-    facet.rows.first.count.should == 3
-    facet.rows.last.value.should == 3
-    facet.rows.last.count.should == 1
+    expect(facet.rows.first.value).to eq(1)
+    expect(facet.rows.first.count).to eq(3)
+    expect(facet.rows.last.value).to eq(3)
+    expect(facet.rows.last.count).to eq(1)
   end
 
   it 'returns instantiated facet values' do
     blogs = Array.new(2) { Blog.new }
     stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
     search = session.search(Post) { facet(:blog_id) }
-    search.facet(:blog_id).rows.map { |row| row.instance }.should == blogs
+    expect(search.facet(:blog_id).rows.map { |row| row.instance }).to eq(blogs)
   end
 
   it 'returns all instantiated facet rows, whether or not the instances exist' do
@@ -311,7 +314,7 @@ describe 'faceting', :type => :search do
     blogs.last.destroy
     stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
     search = session.search(Post) { facet(:blog_id) }
-    search.facet(:blog_id).rows.map { |row| row.instance }.should == [blogs.first, nil]
+    expect(search.facet(:blog_id).rows.map { |row| row.instance }).to eq([blogs.first, nil])
   end
 
   it 'returns only rows with available instances if specified' do
@@ -319,7 +322,7 @@ describe 'faceting', :type => :search do
     blogs.last.destroy
     stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
     search = session.search(Post) { facet(:blog_id) }
-    search.facet(:blog_id).rows(:verify => true).map { |row| row.instance }.should == blogs[0..0]
+    expect(search.facet(:blog_id).rows(:verify => true).map { |row| row.instance }).to eq(blogs[0..0])
   end
 
   it 'returns both verified and unverified rows from the same facet' do
@@ -327,14 +330,14 @@ describe 'faceting', :type => :search do
     blogs.last.destroy
     stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
     search = session.search(Post) { facet(:blog_id) }
-    search.facet(:blog_id).rows(:verify => true).map { |row| row.instance }.should == blogs[0..0]
-    search.facet(:blog_id).rows.map { |row| row.instance }.should == [blogs.first, nil]
+    expect(search.facet(:blog_id).rows(:verify => true).map { |row| row.instance }).to eq(blogs[0..0])
+    expect(search.facet(:blog_id).rows.map { |row| row.instance }).to eq([blogs.first, nil])
   end
 
   it 'ignores :verify option if facet not a reference facet' do
     stub_facet(:category_ids_im, '1' => 2, '2' => 1)
     search = session.search(Post) { facet(:category_ids) }
-    search.facet(:category_ids).should have(2).rows(:verify => true)
+    expect(search.facet(:category_ids).rows(:verify => true).size).to eq(2)
   end
 
   it 'returns instantiated facet values for limited field facet' do
@@ -346,7 +349,7 @@ describe 'faceting', :type => :search do
     search = session.search(Post) do
       facet(:blog_id, :only => blogs.map { |blog| blog.id })
     end
-    search.facet(:blog_id).rows.map { |row| row.instance }.should == blogs
+    expect(search.facet(:blog_id).rows.map { |row| row.instance }).to eq(blogs)
   end
 
   it 'only queries the persistent store once for an instantiated facet' do
@@ -355,6 +358,6 @@ describe 'faceting', :type => :search do
     stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
     result = session.search(Post) { facet(:blog_id) }
     result.facet(:blog_id).rows.each { |row| row.instance }
-    (Blog.query_count - query_count).should == 1
+    expect(Blog.query_count - query_count).to eq(1)
   end
 end

data/spec/api/search/highlighting_spec.rb

@@ -14,38 +14,38 @@ describe 'search with highlighting results', :type => :search do
   end
 
   it 'returns all highlights' do
-    @search.hits.last.should have(3).highlights
+    expect(@search.hits.last.highlights.size).to eq(3)
   end
 
   it 'returns all highlights for a specified field' do
-    @search.hits.last.should have(2).highlights(:body)
+    expect(@search.hits.last.highlights(:body).size).to eq(2)
   end
 
   it 'returns first highlight for a specified field' do
-    @search.hits.first.highlight(:title).format.should == 'one <em>two</em> three'
+    expect(@search.hits.first.highlight(:title).format).to eq('one <em>two</em> three')
   end
 
   it 'returns an empty array if a given field does not have a highlight' do
-    @search.hits.first.highlights(:body).should == []
+    expect(@search.hits.first.highlights(:body)).to eq([])
   end
 
   it 'formats hits with <em> by default' do
     highlight = @search.hits.first.highlights(:title).first.formatted
-    highlight.should == 'one <em>two</em> three'
+    expect(highlight).to eq('one <em>two</em> three')
   end
 
   it 'formats hits with provided block' do
     highlight = @search.hits.first.highlights(:title).first.format do |word|
       "<i>#{word}</i>"
     end
-    highlight.should == 'one <i>two</i> three'
+    expect(highlight).to eq('one <i>two</i> three')
   end
 
   it 'handles multiple highlighted words' do
     highlight = @search.hits.last.highlights(:body).last.format do |word|
       "<b>#{word}</b>"
     end
-    highlight.should == '<b>eight</b> nine <b>ten</b>'
+    expect(highlight).to eq('<b>eight</b> nine <b>ten</b>')
   end
 
   private

data/spec/api/search/hits_spec.rb

@@ -5,37 +5,51 @@ describe 'hits', :type => :search do
     post_1, post_2 = Array.new(2) { Post.new }
     stub_results(post_1, post_2)
     %w(load load_all).each do |message|
-      MockAdapter::DataAccessor.should_not_receive(message)
+      expect(MockAdapter::DataAccessor).not_to receive(message)
     end
-    session.search(Post).hits.map do |hit|
+    expect(session.search(Post).hits.map do |hit|
       [hit.class_name, hit.primary_key]
-    end.should == [['Post', post_1.id.to_s], ['Post', post_2.id.to_s]]
+    end).to eq([['Post', post_1.id.to_s], ['Post', post_2.id.to_s]])
+  end
+
+  it "should return ID prefix when used with compositeId shard router" do
+    Sunspot.index!(ModelWithPrefixId.new)
+
+    expect(Sunspot.search(ModelWithPrefixId).
+      hits.map { |h| h.id_prefix }.uniq).to eq ["USERDATA!"]
+  end
+
+  it "should parse nested ID prefixes" do
+    Sunspot.index!(ModelWithNestedPrefixId.new)
+
+    expect(Sunspot.search(ModelWithNestedPrefixId).
+      hits.map { |h| h.id_prefix }.uniq).to eq ["USER!USERDATA!"]
   end
 
   it 'returns search total as attribute of hits' do
     stub_results(Post.new, 4)
-    session.search(Post) do
+    expect(session.search(Post) do
       paginate(:page => 1)
-    end.hits.total_entries.should == 4
+    end.hits.total_entries).to eq(4)
   end
 
   it 'returns search total as attribute of verified hits' do
     stub_results(Post.new, 4)
-    session.search(Post) do
+    expect(session.search(Post) do
       paginate(:page => 1)
-    end.hits(:verify => true).total_entries.should == 4
+    end.hits(:verify => true).total_entries).to eq(4)
   end
 
   it 'should return instance from hit' do
     posts = Array.new(2) { Post.new }
     stub_results(*posts)
-    session.search(Post).hits.first.instance.should == posts.first
+    expect(session.search(Post).hits.first.instance).to eq(posts.first)
   end
 
   it 'should return the instance primary key when you use it as a param' do
     posts = Array.new(2) { Post.new }
     stub_results(*posts)
-    session.search(Post).hits.first.to_param.should == posts.first.id.to_s
+    expect(session.search(Post).hits.first.to_param).to eq(posts.first.id.to_s)
   end
 
   it 'should provide iterator over hits with instances' do
@@ -49,8 +63,8 @@ describe 'hits', :type => :search do
       results << result
     end
 
-    hits.should have(2).hits
-    results.should have(2).results
+    expect(hits.size).to eq(2)
+    expect(results.size).to eq(2)
   end
 
   it 'should provide an Enumerator over hits with instances' do
@@ -59,9 +73,9 @@ describe 'hits', :type => :search do
     search = session.search(Post)
     hits, results = [], []
     search.each_hit_with_result.with_index do |(hit, result), index|
-      hit.should be_kind_of(Sunspot::Search::Hit)
-      result.should be_kind_of(Post)
-      index.should be_kind_of(Integer)
+      expect(hit).to be_kind_of(Sunspot::Search::Hit)
+      expect(result).to be_kind_of(Post)
+      expect(index).to be_kind_of(Integer)
     end
   end
 
@@ -71,9 +85,9 @@ describe 'hits', :type => :search do
     search = session.search(Post)
     search.hits.first.instance
     %w(load load_all).each do |message|
-      MockAdapter::DataAccessor.should_not_receive(message)
+      expect(MockAdapter::DataAccessor).not_to receive(message)
     end
-    search.hits.last.instance.should == posts.last
+    expect(search.hits.last.instance).to eq(posts.last)
   end
 
   it 'should return only hits whose referenced object exists in the data store if :verify option passed' do
@@ -81,7 +95,7 @@ describe 'hits', :type => :search do
     posts.last.destroy
     stub_results(*posts)
     search = session.search(Post)
-    search.hits(:verify => true).map { |hit| hit.instance }.should == posts[0..0]
+    expect(search.hits(:verify => true).map { |hit| hit.instance }).to eq(posts[0..0])
   end
 
   it 'should return verified and unverified hits from the same search' do
@@ -89,59 +103,59 @@ describe 'hits', :type => :search do
     posts.last.destroy
     stub_results(*posts)
     search = session.search(Post)
-    search.hits(:verify => true).map { |hit| hit.instance }.should == posts[0..0]
-    search.hits.map { |hit| hit.instance }.should == [posts.first, nil]
+    expect(search.hits(:verify => true).map { |hit| hit.instance }).to eq(posts[0..0])
+    expect(search.hits.map { |hit| hit.instance }).to eq([posts.first, nil])
   end
 
   it 'should attach score to hits' do
     stub_full_results('instance' => Post.new, 'score' => 1.23)
-    session.search(Post).hits.first.score.should == 1.23
+    expect(session.search(Post).hits.first.score).to eq(1.23)
   end
 
   it 'should return stored field values in hits' do
     stub_full_results('instance' => Post.new, 'title_ss' => 'Title')
-    session.search(Post).hits.first.stored(:title).should == 'Title'
+    expect(session.search(Post).hits.first.stored(:title)).to eq('Title')
   end
 
   it 'should return stored field values for searches against multiple types' do
     stub_full_results('instance' => Post.new, 'title_ss' => 'Title')
-    session.search(Post, Namespaced::Comment).hits.first.stored(:title).should == 'Title'
+    expect(session.search(Post, Namespaced::Comment).hits.first.stored(:title)).to eq('Title')
   end
 
   it 'should return stored field values for searches against base type when subtype matches' do
     class SubclassedPost < Post; end;
     stub_full_results('instance' => SubclassedPost.new, 'title_ss' => 'Title')
-    session.search(Post).hits.first.stored(:title).should == 'Title'
+    expect(session.search(Post).hits.first.stored(:title)).to eq('Title')
   end
 
   it 'should return stored text fields' do
     stub_full_results('instance' => Post.new, 'body_textsv' => 'Body')
-    session.search(Post, Namespaced::Comment).hits.first.stored(:body).should == 'Body'
+    expect(session.search(Post, Namespaced::Comment).hits.first.stored(:body)).to eq('Body')
   end
 
   it 'should return stored boolean fields' do
     stub_full_results('instance' => Post.new, 'featured_bs' => true)
-    session.search(Post, Namespaced::Comment).hits.first.stored(:featured).should be_true
+    expect(session.search(Post, Namespaced::Comment).hits.first.stored(:featured)).to be(true)
   end
 
   it 'should return stored boolean fields that evaluate to false' do
     stub_full_results('instance' => Post.new, 'featured_bs' => false)
-    session.search(Post, Namespaced::Comment).hits.first.stored(:featured).should == false
+    expect(session.search(Post, Namespaced::Comment).hits.first.stored(:featured)).to eq(false)
   end
 
   it 'should return stored dynamic fields' do
     stub_full_results('instance' => Post.new, 'custom_string:test_ss' => 'Custom')
-    session.search(Post, Namespaced::Comment).hits.first.stored(:custom_string, :test).should == 'Custom'
+    expect(session.search(Post, Namespaced::Comment).hits.first.stored(:custom_string, :test)).to eq('Custom')
   end
 
   it 'should typecast stored field values in hits' do
     time = Time.utc(2008, 7, 8, 2, 45)
     stub_full_results('instance' => Post.new, 'last_indexed_at_ds' => time.xmlschema)
-    session.search(Post).hits.first.stored(:last_indexed_at).should == time
+    expect(session.search(Post).hits.first.stored(:last_indexed_at)).to eq(time)
   end
 
   it 'should return stored values for multi-valued fields' do
     stub_full_results('instance' => User.new, 'role_ids_ims' => %w(1 4 5))
-    session.search(User).hits.first.stored(:role_ids).should == [1, 4, 5]
+    expect(session.search(User).hits.first.stored(:role_ids)).to eq([1, 4, 5])
   end
 end

data/spec/api/search/paginated_collection_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 describe "PaginatedCollection" do
   subject { Sunspot::Search::PaginatedCollection.new [], 1, 10, 20 }
 
-  it { subject.should be_an(Array) }
+  it { expect(subject).to be_an(Array) }
 
   describe "#send" do
     it 'should allow send' do
@@ -13,37 +13,37 @@ describe "PaginatedCollection" do
 
   describe "#respond_to?" do
     it 'should return true for current_page' do
-      subject.respond_to?(:current_page).should be_true
+      expect(subject.respond_to?(:current_page)).to be(true)
     end
   end
 
   context "behaves like a WillPaginate::Collection" do
-    it { subject.total_entries.should eql(20) }
-    it { subject.total_pages.should eql(2) }
-    it { subject.current_page.should eql(1) }
-    it { subject.per_page.should eql(10) }
-    it { subject.previous_page.should be_nil }
-    it { subject.prev_page.should be_nil }
-    it { subject.next_page.should eql(2) }
-    it { subject.out_of_bounds?.should_not be_true }
-    it { subject.offset.should eql(0) }
+    it { expect(subject.total_entries).to eql(20) }
+    it { expect(subject.total_pages).to eql(2) }
+    it { expect(subject.current_page).to eql(1) }
+    it { expect(subject.per_page).to eql(10) }
+    it { expect(subject.previous_page).to be_nil }
+    it { expect(subject.prev_page).to be_nil }
+    it { expect(subject.next_page).to eql(2) }
+    it { expect(subject.out_of_bounds?).not_to be(true) }
+    it { expect(subject.offset).to eql(0) }
 
     it 'should allow setting total_count' do
       subject.total_count = 1
-      subject.total_count.should eql(1)
+      expect(subject.total_count).to eql(1)
     end
 
     it 'should allow setting total_entries' do
       subject.total_entries = 1
-      subject.total_entries.should eql(1)
+      expect(subject.total_entries).to eql(1)
     end
   end
 
   context "behaves like Kaminari" do
-    it { subject.total_count.should eql(20) }
-    it { subject.num_pages.should eql(2) }
-    it { subject.limit_value.should eql(10) }
-    it { subject.first_page?.should be_true }
-    it { subject.last_page?.should_not be_true }
+    it { expect(subject.total_count).to eql(20) }
+    it { expect(subject.num_pages).to eql(2) }
+    it { expect(subject.limit_value).to eql(10) }
+    it { expect(subject.first_page?).to be(true) }
+    it { expect(subject.last_page?).not_to be(true) }
   end
 end