sunspot 2.2.7 → 2.5.0

data/spec/api/query/group_spec.rb

@@ -6,8 +6,8 @@ describe "grouping" do
       group :title
     end
 
-    connection.should have_last_search_including(:group, "true")
-    connection.should have_last_search_including(:"group.field", "title_ss")
+    expect(connection).to have_last_search_including(:group, "true")
+    expect(connection).to have_last_search_including(:"group.field", "title_ss")
   end
 
   it "sends grouping limit parameters to solr" do
@@ -17,7 +17,7 @@ describe "grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.limit", 2)
+    expect(connection).to have_last_search_including(:"group.limit", 2)
   end
 
   it "sends grouping sort parameters to solr" do
@@ -27,7 +27,7 @@ describe "grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.sort", "average_rating_ft asc")
+    expect(connection).to have_last_search_including(:"group.sort", "average_rating_ft asc")
   end
 
   it "sends grouping field parameters to solr" do
@@ -37,7 +37,7 @@ describe "grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.field", "title_ss")
+    expect(connection).to have_last_search_including(:"group.field", "title_ss")
   end
 
   it "sends grouping query parameters to solr" do
@@ -49,6 +49,6 @@ describe "grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.query", "category_ids_im:1")
+    expect(connection).to have_last_search_including(:"group.query", "category_ids_im:1")
   end
 end

data/spec/api/query/highlighting_examples.rb

@@ -3,21 +3,21 @@ shared_examples_for "query with highlighting support" do
     search do
       keywords 'test'
     end
-    connection.should_not have_last_search_with(:hl)
+    expect(connection).not_to have_last_search_with(:hl)
   end
 
   it 'should enable highlighting when highlighting requested as keywords argument' do
     search do
       keywords 'test', :highlight => true
     end
-    connection.should have_last_search_with(:hl => 'on')
+    expect(connection).to have_last_search_with(:hl => 'on')
   end
 
   it 'should not set highlight fields parameter if highlight fields are not passed' do
     search do
       keywords 'test', :highlight => true, :fields => [:title]
     end
-    connection.should_not have_last_search_with(:'hl.fl')
+    expect(connection).not_to have_last_search_with(:'hl.fl')
   end
 
   it 'should enable highlighting on multiple fields when highlighting requested as array of fields via keywords argument' do
@@ -25,15 +25,15 @@ shared_examples_for "query with highlighting support" do
       keywords 'test', :highlight => [:title, :body]
     end
 
-    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
+    expect(connection).to have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
   end
 
   it 'should raise UnrecognizedFieldError if try to highlight unexisting field via keywords argument' do
-    lambda {
+    expect {
       search do
         keywords 'test', :highlight => [:unknown_field]
       end
-    }.should raise_error(Sunspot::UnrecognizedFieldError)
+    }.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should enable highlighting on multiple fields when highlighting requested as list of fields via block call' do
@@ -43,7 +43,7 @@ shared_examples_for "query with highlighting support" do
       end
     end
 
-    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
+    expect(connection).to have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
   end
 
   it 'should enable highlighting on multiple fields for multiple search types' do
@@ -52,24 +52,24 @@ shared_examples_for "query with highlighting support" do
         highlight :body
       end
     end
-    connection.searches.last[:'hl.fl'].to_set.should == Set['body_text', 'body_textsv']
+    expect(connection.searches.last[:'hl.fl'].to_set).to eq(Set['body_text', 'body_textsv'])
   end
 
   it 'should raise UnrecognizedFieldError if try to highlight unexisting field via block call' do
-    lambda {
+    expect {
       search do
         keywords 'test' do
           highlight :unknown_field
         end
       end
-    }.should raise_error(Sunspot::UnrecognizedFieldError)
+    }.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should set internal formatting' do
     search do
       keywords 'test', :highlight => true
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.simple.pre" => '@@@hl@@@',
       :"hl.simple.post" => '@@@endhl@@@'
     )
@@ -81,7 +81,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl" => %w(title_text)
     )
   end
@@ -90,7 +90,7 @@ shared_examples_for "query with highlighting support" do
     search do
       keywords 'test', :highlight => :body
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.simple.pre" => '@@@hl@@@',
       :"hl.simple.post" => '@@@endhl@@@'
     )
@@ -102,7 +102,7 @@ shared_examples_for "query with highlighting support" do
         highlight :max_snippets => 3
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.snippets" => 3
     )
   end
@@ -113,7 +113,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :max_snippets => 3
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl"       => %w(title_text),
       :"f.title_text.hl.snippets" => 3
     )
@@ -125,7 +125,7 @@ shared_examples_for "query with highlighting support" do
         highlight :fragment_size => 200
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fragsize" => 200
     )
   end
@@ -136,7 +136,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :fragment_size => 200
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.fragsize" => 200
     )
   end
@@ -147,7 +147,7 @@ shared_examples_for "query with highlighting support" do
         highlight :merge_contiguous_fragments => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.mergeContiguous" => 'true'
     )
   end
@@ -158,7 +158,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :merge_contiguous_fragments => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.mergeContiguous" => 'true'
     )
   end
@@ -169,7 +169,7 @@ shared_examples_for "query with highlighting support" do
         highlight :phrase_highlighter => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.usePhraseHighlighter" => 'true'
     )
   end
@@ -180,7 +180,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :phrase_highlighter => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.usePhraseHighlighter" => 'true'
     )
   end
@@ -191,7 +191,7 @@ shared_examples_for "query with highlighting support" do
         highlight :phrase_highlighter => true, :require_field_match => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.requireFieldMatch" => 'true'
     )
   end
@@ -202,7 +202,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :phrase_highlighter => true, :require_field_match => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.requireFieldMatch" => 'true'
     )
   end
@@ -214,7 +214,7 @@ shared_examples_for "query with highlighting support" do
         highlight :body, :max_snippets => 1
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl" => %w(title_text body_textsv),
       :"f.title_text.hl.snippets" => 2,
       :"f.body_textsv.hl.snippets" => 1
@@ -227,7 +227,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :formatter => 'formatter'
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.formatter" => 'formatter'
     )
   end
@@ -238,7 +238,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :fragmenter => 'example_fragmenter'
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.fragmenter" => 'example_fragmenter'
     )
   end

data/spec/api/query/join_spec.rb

@@ -5,7 +5,7 @@ describe 'join' do
     session.search PhotoContainer do
       with(:caption, 'blah')
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "{!join from=photo_container_id_i to=id_i}caption_s:blah")
   end
 
@@ -13,7 +13,7 @@ describe 'join' do
     session.search PhotoContainer do
       with(:photo_rating).greater_than(3)
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "{!join from=photo_container_id_i to=id_i}average_rating_ft:{3\\.0 TO *}")
   end
 end

data/spec/api/query/more_like_this_spec.rb

@@ -16,42 +16,42 @@ describe 'more_like_this' do
   it 'should query passed in object' do
     p = Post.new
     session.more_like_this(p)
-    connection.should have_last_search_with(:q => "id:Post\\ #{p.id}")
+    expect(connection).to have_last_search_with(:q => "id:Post\\ #{p.id}")
   end
 
   it 'should use more_like_this fields if no fields specified' do
     session.more_like_this(Post.new)
-    connection.searches.last[:"mlt.fl"].split(',').sort.should == %w(body_textsv tags_textv)
+    expect(connection.searches.last[:"mlt.fl"].split(',').sort).to eq(%w(body_textsv tags_textv))
   end
 
   it 'should use more_like_this fields if specified' do
     session.more_like_this(Post.new) do
       fields :body
     end
-    connection.should have_last_search_with(:"mlt.fl" => "body_textsv")
+    expect(connection).to have_last_search_with(:"mlt.fl" => "body_textsv")
   end
 
   it 'assigns boosts to fields when specified' do
     session.more_like_this(Post.new) do
       fields :body, :tags => 8
     end
-    connection.searches.last[:"mlt.fl"].split(',').sort.should == %w(body_textsv tags_textv)
-    connection.should have_last_search_with(:"mlt.qf" => "tags_textv^8")
+    expect(connection.searches.last[:"mlt.fl"].split(',').sort).to eq(%w(body_textsv tags_textv))
+    expect(connection).to have_last_search_with(:"mlt.qf" => "tags_textv^8")
   end
 
   it 'doesn\'t assign boosts to fields when not specified' do
     session.more_like_this(Post.new) do
       fields :body
     end
-    connection.should_not have_last_search_with(:qf)
+    expect(connection).not_to have_last_search_with(:qf)
   end
 
   it 'should raise ArgumentError if a field is not setup for more_like_this' do
-    lambda do
+    expect do
       session.more_like_this(Post.new) do
         fields :title
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it 'should accept options' do
@@ -63,12 +63,12 @@ describe 'more_like_this' do
       maximum_query_terms 5
       boost_by_relevance false
     end
-    connection.should have_last_search_with(:"mlt.mintf" => 1)
-    connection.should have_last_search_with(:"mlt.mindf" => 2)
-    connection.should have_last_search_with(:"mlt.minwl" => 3)
-    connection.should have_last_search_with(:"mlt.maxwl" => 4)
-    connection.should have_last_search_with(:"mlt.maxqt" => 5)
-    connection.should have_last_search_with(:"mlt.boost" => false)
+    expect(connection).to have_last_search_with(:"mlt.mintf" => 1)
+    expect(connection).to have_last_search_with(:"mlt.mindf" => 2)
+    expect(connection).to have_last_search_with(:"mlt.minwl" => 3)
+    expect(connection).to have_last_search_with(:"mlt.maxwl" => 4)
+    expect(connection).to have_last_search_with(:"mlt.maxqt" => 5)
+    expect(connection).to have_last_search_with(:"mlt.boost" => false)
   end
 
   it 'should accept short options' do
@@ -80,45 +80,45 @@ describe 'more_like_this' do
       maxqt 5
       boost true
     end
-    connection.should have_last_search_with(:"mlt.mintf" => 1)
-    connection.should have_last_search_with(:"mlt.mindf" => 2)
-    connection.should have_last_search_with(:"mlt.minwl" => 3)
-    connection.should have_last_search_with(:"mlt.maxwl" => 4)
-    connection.should have_last_search_with(:"mlt.maxqt" => 5)
-    connection.should have_last_search_with(:"mlt.boost" => true)
+    expect(connection).to have_last_search_with(:"mlt.mintf" => 1)
+    expect(connection).to have_last_search_with(:"mlt.mindf" => 2)
+    expect(connection).to have_last_search_with(:"mlt.minwl" => 3)
+    expect(connection).to have_last_search_with(:"mlt.maxwl" => 4)
+    expect(connection).to have_last_search_with(:"mlt.maxqt" => 5)
+    expect(connection).to have_last_search_with(:"mlt.boost" => true)
   end
 
   it 'paginates using default per_page when page not provided' do
     session.more_like_this(Post.new)
-    connection.should have_last_search_with(:rows => 30)
+    expect(connection).to have_last_search_with(:rows => 30)
   end
 
   it 'paginates using default per_page when page provided' do
     session.more_like_this(Post.new) do
       paginate :page => 2
     end
-    connection.should have_last_search_with(:rows => 30, :start => 30)
+    expect(connection).to have_last_search_with(:rows => 30, :start => 30)
   end
 
   it 'paginates using provided per_page' do
     session.more_like_this(Post.new) do
       paginate :page => 4, :per_page => 15
     end
-    connection.should have_last_search_with(:rows => 15, :start => 45)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 45)
   end
 
   it 'defaults to page 1 if no :page argument given' do
     session.more_like_this(Post.new) do
       paginate :per_page => 15
     end
-    connection.should have_last_search_with(:rows => 15, :start => 0)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 0)
   end
 
   it 'paginates from string argument' do
     session.more_like_this(Post.new) do
       paginate :page => '3', :per_page => '15'
     end
-    connection.should have_last_search_with(:rows => 15, :start => 30)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 30)
   end
 
   it "should send query to solr with adjusted parameters (keyword example)" do
@@ -128,8 +128,8 @@ describe 'more_like_this' do
         params[:some] = 'param'
       end
     end
-    connection.should have_last_search_with(:q    => 'new search')
-    connection.should have_last_search_with(:some => 'param')
+    expect(connection).to have_last_search_with(:q    => 'new search')
+    expect(connection).to have_last_search_with(:some => 'param')
   end
 
   it "should send query to solr with adjusted parameters in multiple blocks" do
@@ -141,8 +141,8 @@ describe 'more_like_this' do
         params[:some] = 'param'
       end
     end
-    connection.should have_last_search_with(:q    => 'new search')
-    connection.should have_last_search_with(:some => 'param')
+    expect(connection).to have_last_search_with(:q    => 'new search')
+    expect(connection).to have_last_search_with(:some => 'param')
   end
 
   private

data/spec/api/query/ordering_pagination_examples.rb

@@ -1,70 +1,70 @@
 shared_examples_for 'sortable query' do
   it 'paginates using default per_page when page not provided' do
     search
-    connection.should have_last_search_with(:rows => 30)
+    expect(connection).to have_last_search_with(:rows => 30)
   end
 
   it 'paginates using default per_page when page provided' do
     search do
       paginate :page => 2
     end
-    connection.should have_last_search_with(:rows => 30, :start => 30)
+    expect(connection).to have_last_search_with(:rows => 30, :start => 30)
   end
 
   it 'paginates using provided per_page' do
     search do
       paginate :page => 4, :per_page => 15
     end
-    connection.should have_last_search_with(:rows => 15, :start => 45)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 45)
   end
 
   it 'defaults to page 1 if no :page argument given' do
     search do
       paginate :per_page => 15
     end
-    connection.should have_last_search_with(:rows => 15, :start => 0)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 0)
   end
 
   it 'paginates with an offset' do
     search do
       paginate :per_page => 15, :offset => 3
     end
-    connection.should have_last_search_with(:rows => 15, :start => 3)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 3)
   end
 
   it 'paginates with an offset as a string' do
     search do
       paginate :per_page => 15, :offset => '3'
     end
-    connection.should have_last_search_with(:rows => 15, :start => 3)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 3)
   end
 
   it 'paginates from string argument' do
     search do
       paginate :page => '3', :per_page => '15'
     end
-    connection.should have_last_search_with(:rows => 15, :start => 30)
+    expect(connection).to have_last_search_with(:rows => 15, :start => 30)
   end
 
   it 'paginates with initial cursor' do
     search do
       paginate :cursor => '*', :per_page => 15
     end
-    connection.should have_last_search_with(:rows => 15, :cursorMark => '*')
+    expect(connection).to have_last_search_with(:rows => 15, :cursorMark => '*')
   end
 
   it 'paginates with given cursor' do
     search do
       paginate :cursor => 'AoIIP4AAACxQcm9maWxlIDEwMTk='
     end
-    connection.should have_last_search_with(:cursorMark => 'AoIIP4AAACxQcm9maWxlIDEwMTk=')
+    expect(connection).to have_last_search_with(:cursorMark => 'AoIIP4AAACxQcm9maWxlIDEwMTk=')
   end
 
   it 'orders by a single field' do
     search do
       order_by :average_rating, :desc
     end
-    connection.should have_last_search_with(:sort => 'average_rating_ft desc')
+    expect(connection).to have_last_search_with(:sort => 'average_rating_ft desc')
   end
 
   it 'orders by multiple fields' do
@@ -72,80 +72,80 @@ shared_examples_for 'sortable query' do
       order_by :average_rating, :desc
       order_by :sort_title, :asc
     end
-    connection.should have_last_search_with(:sort => 'average_rating_ft desc, sort_title_s asc')
+    expect(connection).to have_last_search_with(:sort => 'average_rating_ft desc, sort_title_s asc')
   end
 
   it 'orders by random' do
     search do
       order_by :random
     end
-    connection.searches.last[:sort].should =~ /^random_\d+ asc$/
+    expect(connection.searches.last[:sort]).to match(/^random_\d+ asc$/)
   end
 
   it 'orders by random with declared direction' do
     search do
       order_by :random, :desc
     end
-    connection.searches.last[:sort].should =~ /^random_\d+ desc$/
+    expect(connection.searches.last[:sort]).to match(/^random_\d+ desc$/)
   end
 
   it 'orders by random with provided seed value' do
     search do
       order_by :random, :seed => 9001
     end
-    connection.searches.last[:sort].should =~ /^random_9001 asc$/
+    expect(connection.searches.last[:sort]).to match(/^random_9001 asc$/)
   end
 
   it 'orders by random with provided seed value and direction' do
     search do
       order_by :random, :seed => 12345, :direction => :desc
     end
-    connection.searches.last[:sort].should =~ /^random_12345 desc$/
+    expect(connection.searches.last[:sort]).to match(/^random_12345 desc$/)
   end
 
   it 'orders by score' do
     search do
       order_by :score, :desc
     end
-    connection.should have_last_search_with(:sort => 'score desc')
+    expect(connection).to have_last_search_with(:sort => 'score desc')
   end
 
   it 'orders by geodist' do
     search do
       order_by_geodist :coordinates_new, 32, -68, :desc
     end
-    connection.should have_last_search_with(:sort => 'geodist(coordinates_new_ll,32,-68) desc')
+    expect(connection).to have_last_search_with(:sort => 'geodist(coordinates_new_ll,32,-68) desc')
   end
 
   it 'throws an ArgumentError if a bogus order direction is given' do
-    lambda do
+    expect do
       search do
         order_by :sort_title, :sideways
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it 'throws an UnrecognizedFieldError if :distance is given for sort' do
-    lambda do
+    expect do
       search do
         order_by :distance, :asc
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'does not allow ordering by multiple-value fields' do
-    lambda do
+    expect do
       search do
         order_by :category_ids
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it 'raises ArgumentError if bogus argument given to paginate' do
-    lambda do
+    expect do
       search do
         paginate :page => 4, :ugly => :puppy
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 end