sunspot 2.2.7 → 2.5.0

data/spec/api/query/fulltext_examples.rb

@@ -3,28 +3,28 @@ shared_examples_for 'fulltext query' do
     search do
       keywords 'keyword search'
     end
-    connection.should have_last_search_with(:q => 'keyword search')
+    expect(connection).to have_last_search_with(:q => 'keyword search')
   end
 
   it 'ignores keywords if empty' do
     search do
       keywords ''
     end
-    connection.should_not have_last_search_with(:defType => 'edismax')
+    expect(connection).not_to have_last_search_with(:defType => 'edismax')
   end
 
   it 'ignores keywords if nil' do
     search do
       keywords nil
     end
-    connection.should_not have_last_search_with(:defType => 'edismax')
+    expect(connection).not_to have_last_search_with(:defType => 'edismax')
   end
 
   it 'ignores keywords with only whitespace' do
     search do
       keywords "  \t"
     end
-    connection.should_not have_last_search_with(:defType => 'edismax')
+    expect(connection).not_to have_last_search_with(:defType => 'edismax')
   end
 
   it 'gracefully ignores keywords block if keywords ignored' do
@@ -37,14 +37,14 @@ shared_examples_for 'fulltext query' do
     search do
       keywords 'keyword search'
     end
-    connection.should have_last_search_with(:defType => 'edismax')
+    expect(connection).to have_last_search_with(:defType => 'edismax')
   end
 
   it 'searches types in filter query if keywords used' do
     search do
       keywords 'keyword search'
     end
-    connection.should have_last_search_with(:fq => ['type:Post'])
+    expect(connection).to have_last_search_with(:fq => ['type:Post'])
   end
 
   describe 'with multiple keyword components' do
@@ -56,20 +56,23 @@ shared_examples_for 'fulltext query' do
     end
 
     it 'puts specified keywords in subquery' do
-      subqueries(:q).map { |subquery| subquery[:v] }.should ==
+      expect(subqueries(:q).map { |subquery| subquery[:v] }).to eq(
         ['first search', 'second search']
+      )
     end
 
     it 'puts specified dismax parameters in subquery' do
-      subqueries(:q).first[:qf].should == 'title_text'
+      expect(subqueries(:q).first[:qf]).to eq('title_text')
     end
 
     it 'puts default dismax parameters in subquery' do
-      subqueries(:q).last[:qf].split(' ').sort.should == %w(backwards_title_text body_textsv tags_textv title_text)
+      expect(subqueries(:q).last[:qf].split(' ').sort).to(
+        eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text))
+      )
     end
 
     it 'puts field list in main query' do
-      connection.should have_last_search_with(:fl => '* score')
+      expect(connection).to have_last_search_with(:fl => '* score')
     end
   end
 
@@ -77,21 +80,25 @@ shared_examples_for 'fulltext query' do
     search = search do
       keywords 'keyword search'
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(backwards_title_text body_textsv tags_textv title_text)
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text))
+    )
   end
 
   it 'searches both stored and unstored text fields' do
     search Post, Namespaced::Comment do
       keywords 'keyword search'
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(author_name_text backwards_title_text body_text body_textsv tags_textv title_text)
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(author_name_text backwards_title_text body_text body_textsv tags_textv text_array_text title_text))
+    )
   end
 
   it 'searches only specified text fields when specified' do
     search do
       keywords 'keyword search', :fields => [:title, :body]
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(body_textsv title_text)
+    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_textsv title_text))
   end
 
   it 'excludes text fields when instructed' do
@@ -100,7 +107,7 @@ shared_examples_for 'fulltext query' do
         exclude_fields :backwards_title, :body_mlt
       end
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(body_textsv tags_textv title_text)
+    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_textsv tags_textv text_array_text title_text))
   end
 
   it 'assigns boost to fields when specified' do
@@ -109,7 +116,7 @@ shared_examples_for 'fulltext query' do
         fields :title => 2.0, :body => 0.75
       end
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(body_textsv^0.75 title_text^2.0)
+    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_textsv^0.75 title_text^2.0))
   end
 
   it 'allows assignment of boosted and unboosted fields' do
@@ -124,19 +131,19 @@ shared_examples_for 'fulltext query' do
     search Post, Namespaced::Comment do
       keywords 'keyword search', :fields => [:body]
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(body_text body_textsv)
+    expect(connection.searches.last[:qf].split(' ').sort).to eq(%w(body_text body_textsv))
   end
 
   it 'requests score when keywords used' do
     search do
       keywords 'keyword search'
     end
-    connection.should have_last_search_with(:fl => '* score')
+    expect(connection).to have_last_search_with(:fl => '* score')
   end
 
   it 'does not request score when keywords not used' do
     search Post
-    connection.should_not have_last_search_with(:fl)
+    expect(connection).not_to have_last_search_with(:fl)
   end
 
   it 'sets phrase fields' do
@@ -145,7 +152,7 @@ shared_examples_for 'fulltext query' do
         phrase_fields :title => 2.0
       end
     end
-    connection.should have_last_search_with(:pf => 'title_text^2.0')
+    expect(connection).to have_last_search_with(:pf => 'title_text^2.0')
   end
 
   it 'sets phrase fields with boost' do
@@ -154,7 +161,7 @@ shared_examples_for 'fulltext query' do
         phrase_fields :title => 1.5
       end
     end
-    connection.should have_last_search_with(:pf => 'title_text^1.5')
+    expect(connection).to have_last_search_with(:pf => 'title_text^1.5')
   end
 
   it 'sets phrase slop from DSL' do
@@ -163,7 +170,7 @@ shared_examples_for 'fulltext query' do
         phrase_slop 2
       end
     end
-    connection.should have_last_search_with(:ps => 2)
+    expect(connection).to have_last_search_with(:ps => 2)
   end
 
   it 'sets boost for certain fields without restricting fields' do
@@ -172,7 +179,9 @@ shared_examples_for 'fulltext query' do
         boost_fields :title => 1.5
       end
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(backwards_title_text body_textsv tags_textv title_text^1.5)
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text^1.5))
+    )
   end
 
   it 'ignores boost fields that do not apply' do
@@ -181,7 +190,9 @@ shared_examples_for 'fulltext query' do
         boost_fields :bogus => 1.2, :title => 1.5
       end
     end
-    connection.searches.last[:qf].split(' ').sort.should == %w(backwards_title_text body_textsv tags_textv title_text^1.5)
+    expect(connection.searches.last[:qf].split(' ').sort).to(
+      eq(%w(backwards_title_text body_textsv tags_textv text_array_text title_text^1.5))
+    )
   end
 
   it 'sets default boost with default fields' do
@@ -189,14 +200,14 @@ shared_examples_for 'fulltext query' do
       keywords 'great pizza'
     end
     # Hashes in 1.8 aren't ordered
-    connection.searches.last[:qf].split(" ").sort.join(" ").should eq 'caption_text^1.5 description_text'
+    expect(connection.searches.last[:qf].split(" ").sort.join(" ")).to eq 'caption_text^1.5 description_text'
   end
 
   it 'sets default boost with fields specified in options' do
     search Photo do
       keywords 'great pizza', :fields => [:caption]
     end
-    connection.should have_last_search_with(:qf => 'caption_text^1.5')
+    expect(connection).to have_last_search_with(:qf => 'caption_text^1.5')
   end
 
   it 'sets default boost with fields specified in DSL' do
@@ -205,7 +216,7 @@ shared_examples_for 'fulltext query' do
         fields :caption
       end
     end
-    connection.should have_last_search_with(:qf => 'caption_text^1.5')
+    expect(connection).to have_last_search_with(:qf => 'caption_text^1.5')
   end
 
   it 'overrides default boost when specified in DSL' do
@@ -214,7 +225,7 @@ shared_examples_for 'fulltext query' do
         fields :caption => 2.0
       end
     end
-    connection.should have_last_search_with(:qf => 'caption_text^2.0')
+    expect(connection).to have_last_search_with(:qf => 'caption_text^2.0')
   end
 
   it 'creates boost query' do
@@ -225,7 +236,7 @@ shared_examples_for 'fulltext query' do
         end
       end
     end
-    connection.should have_last_search_with(:bq => ['average_rating_ft:{2\.0 TO *}^2.0'])
+    expect(connection).to have_last_search_with(:bq => ['average_rating_ft:{2\.0 TO *}^2.0'])
   end
 
   it 'creates multiple boost queries' do
@@ -239,7 +250,7 @@ shared_examples_for 'fulltext query' do
         end
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :bq => [
         'average_rating_ft:{2\.0 TO *}^2.0',
         'featured_bs:true^1.5'
@@ -251,65 +262,65 @@ shared_examples_for 'fulltext query' do
     search do
       keywords 'great pizza', :minimum_match => 2
     end
-    connection.should have_last_search_with(:mm => 2)
+    expect(connection).to have_last_search_with(:mm => 2)
   end
 
   it 'sends minimum match parameter from DSL' do
     search do
       keywords('great pizza') { minimum_match(2) }
     end
-    connection.should have_last_search_with(:mm => 2)
+    expect(connection).to have_last_search_with(:mm => 2)
   end
 
   it 'sends tiebreaker parameter from options' do
     search do
       keywords 'great pizza', :tie => 0.1
     end
-    connection.should have_last_search_with(:tie => 0.1)
+    expect(connection).to have_last_search_with(:tie => 0.1)
   end
 
   it 'sends tiebreaker parameter from DSL' do
     search do
       keywords('great pizza') { tie(0.1) }
     end
-    connection.should have_last_search_with(:tie => 0.1)
+    expect(connection).to have_last_search_with(:tie => 0.1)
   end
 
   it 'sends query phrase slop from options' do
     search do
       keywords 'great pizza', :query_phrase_slop => 2
     end
-    connection.should have_last_search_with(:qs => 2)
+    expect(connection).to have_last_search_with(:qs => 2)
   end
 
   it 'sends query phrase slop from DSL' do
     search do
       keywords('great pizza') { query_phrase_slop(2) }
     end
-    connection.should have_last_search_with(:qs => 2)
+    expect(connection).to have_last_search_with(:qs => 2)
   end
 
   it 'allows specification of a text field that only exists in one type' do
     search Post, Namespaced::Comment do
       keywords 'keywords', :fields => :author_name
     end
-    connection.searches.last[:qf].should == 'author_name_text'
+    expect(connection.searches.last[:qf]).to eq('author_name_text')
   end
 
   it 'raises Sunspot::UnrecognizedFieldError for nonexistant fields in keywords' do
-    lambda do
+    expect do
       search do
         keywords :text, :fields => :bogus
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'raises Sunspot::UnrecognizedFieldError if a text field that does not exist for any type is specified' do
-    lambda do
+    expect do
       search Post, Namespaced::Comment do
         keywords 'fulltext', :fields => :bogus
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   describe 'connective examples' do
@@ -321,7 +332,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='title_text'}keywords1\" OR _query_:\"{!edismax qf='body_textsv'}keyword2\")"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='title_text'}keywords1\" OR _query_:\"{!edismax qf='body_textsv'}keyword2\")"
     end
 
     it 'creates a conjunction inside of a disjunction' do
@@ -336,7 +347,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='body_textsv'}keywords1\" OR (_query_:\"{!edismax qf='body_textsv'}keyword2\" AND _query_:\"{!edismax qf='body_textsv'}keyword3\"))"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='body_textsv'}keywords1\" OR (_query_:\"{!edismax qf='body_textsv'}keyword2\" AND _query_:\"{!edismax qf='body_textsv'}keyword3\"))"
     end
 
     it 'does nothing special if #all/#any called from the top level or called multiple times' do
@@ -347,7 +358,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='title_text'}keywords1\" AND _query_:\"{!edismax qf='body_textsv'}keyword2\")"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='title_text'}keywords1\" AND _query_:\"{!edismax qf='body_textsv'}keyword2\")"
     end
 
     it 'does nothing special if #all/#any are mixed and called multiple times' do
@@ -362,7 +373,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='title_text'}keywords1\" AND _query_:\"{!edismax qf='body_textsv'}keyword2\")"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='title_text'}keywords1\" AND _query_:\"{!edismax qf='body_textsv'}keyword2\")"
 
       search Post do
         any do
@@ -375,7 +386,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='title_text'}keywords1\" OR _query_:\"{!edismax qf='body_textsv'}keyword2\")"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='title_text'}keywords1\" OR _query_:\"{!edismax qf='body_textsv'}keyword2\")"
     end
 
     it "does not add empty parentheses" do
@@ -392,7 +403,7 @@ shared_examples_for 'fulltext query' do
         end
       end
 
-      connection.searches.last[:q].should eq "_query_:\"{!edismax qf='title_text'}keywords1\""
+      expect(connection.searches.last[:q]).to eq "_query_:\"{!edismax qf='title_text'}keywords1\""
     end
   end
 
@@ -407,11 +418,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      connection.searches.last[:q].should eq "(_query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\" OR _query_:\"{!edismax qf='description_text^1.2'}keyword2\")"
-      connection.searches.last[q_name].should eq "_query_:\"{!edismax qf='caption_text'}keyword1\""
-      connection.searches.last[fq_name].should eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\" OR _query_:\"{!edismax qf='description_text^1.2'}keyword2\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='caption_text'}keyword1\""
     end
 
     it "should be able to resolve name conflicts with the :prefix option" do
@@ -424,11 +433,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='description_text^1.2'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\")"
-      connection.searches.last[q_name].should eq "_query_:\"{!edismax qf='description_text'}keyword2\""
-      connection.searches.last[fq_name].should eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.2'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='description_text'}keyword2\""
     end
 
     it "should recognize fields when adding from DSL, e.g. when calling boost_fields" do
@@ -442,11 +449,9 @@ shared_examples_for 'fulltext query' do
 
       obj_id = find_ob_id(srch)
       q_name = "qPhoto#{obj_id}"
-      fq_name = "f#{q_name}"
 
-      connection.searches.last[:q].should eq "(_query_:\"{!edismax qf='description_text^1.5'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name} fq=$#{fq_name}}\")"
-      connection.searches.last[q_name].should eq "_query_:\"{!edismax qf='description_text^1.3'}keyword1\""
-      connection.searches.last[fq_name].should eq "type:Photo"
+      expect(connection.searches.last[:q]).to eq "(_query_:\"{!edismax qf='description_text^1.5'}keyword1\" OR _query_:\"{!join from=photo_container_id_i to=id_i v=$#{q_name}}\")"
+      expect(connection.searches.last[q_name]).to eq "_query_:\"{!field f=type}Photo\"+_query_:\"{!edismax qf='description_text^1.3'}keyword1\""
     end
 
     private

data/spec/api/query/function_spec.rb

@@ -7,7 +7,7 @@ describe 'function query' do
         boost(function { :average_rating })
       end
     end
-    connection.should have_last_search_including(:bf, 'average_rating_ft')
+    expect(connection).to have_last_search_including(:bf, 'average_rating_ft')
   end
 
   it "should send query to solr with boost function and boost amount" do
@@ -16,7 +16,7 @@ describe 'function query' do
         boost(function { :average_rating }^5)
       end
     end
-    connection.should have_last_search_including(:bf, 'average_rating_ft^5')
+    expect(connection).to have_last_search_including(:bf, 'average_rating_ft^5')
   end
 
   it "should handle boost function with constant float" do
@@ -25,7 +25,7 @@ describe 'function query' do
         boost(function { 10.5 })
       end
     end
-    connection.should have_last_search_including(:bf, '10.5')
+    expect(connection).to have_last_search_including(:bf, '10.5')
   end
 
   it "should handle boost function with constant float and boost amount" do
@@ -34,7 +34,7 @@ describe 'function query' do
         boost(function { 10.5 }^5)
       end
     end
-    connection.should have_last_search_including(:bf, '10.5^5')
+    expect(connection).to have_last_search_including(:bf, '10.5^5')
   end
 
   it "should handle boost function with time literal" do
@@ -43,7 +43,7 @@ describe 'function query' do
         boost(function { Time.parse('2010-03-25 14:13:00 EDT') })
       end
     end
-    connection.should have_last_search_including(:bf, '2010-03-25T18:13:00Z')
+    expect(connection).to have_last_search_including(:bf, '2010-03-25T18:13:00Z')
   end
  
   it "should handle arbitrary functions in a function query block" do
@@ -52,7 +52,7 @@ describe 'function query' do
         boost(function { product(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:bf, 'product(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:bf, 'product(average_rating_ft,10)')
   end
 
   it "should handle the sub function in a function query block" do
@@ -61,7 +61,7 @@ describe 'function query' do
         boost(function { sub(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:bf, 'sub(average_rating_ft,10)')
   end
 
   it "should handle boost amounts on function query block" do
@@ -70,7 +70,7 @@ describe 'function query' do
         boost(function { sub(:average_rating, 10)^5 })
       end
     end
-    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)^5')
+    expect(connection).to have_last_search_including(:bf, 'sub(average_rating_ft,10)^5')
   end
  
   it "should handle nested functions in a function query block" do
@@ -79,28 +79,28 @@ describe 'function query' do
         boost(function { product(:average_rating, sum(:average_rating, 20)) })
       end
     end
-    connection.should have_last_search_including(:bf, 'product(average_rating_ft,sum(average_rating_ft,20))')
+    expect(connection).to have_last_search_including(:bf, 'product(average_rating_ft,sum(average_rating_ft,20))')
   end
 
   # TODO SOLR 1.5
   it "should raise ArgumentError if string literal passed" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           boost(function { "hello world" })
         end
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it "should raise UnrecognizedFieldError if bogus field name passed" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           boost(function { :bogus })
         end
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it "should send query to solr with multiplicative boost function" do
@@ -109,7 +109,7 @@ describe 'function query' do
         multiplicative_boost(function { :average_rating })
       end
     end
-    connection.should have_last_search_including(:boost, 'average_rating_ft')
+    expect(connection).to have_last_search_including(:boost, 'average_rating_ft')
   end
 
   it "should send query to solr with multiplicative boost function and boost amount" do
@@ -118,7 +118,7 @@ describe 'function query' do
         multiplicative_boost(function { :average_rating }^5)
       end
     end
-    connection.should have_last_search_including(:boost, 'average_rating_ft^5')
+    expect(connection).to have_last_search_including(:boost, 'average_rating_ft^5')
   end
 
   it "should handle multiplicative boost function with constant float" do
@@ -127,7 +127,7 @@ describe 'function query' do
         multiplicative_boost(function { 10.5 })
       end
     end
-    connection.should have_last_search_including(:boost, '10.5')
+    expect(connection).to have_last_search_including(:boost, '10.5')
   end
 
   it "should handle multiplicative boost function with constant float and boost amount" do
@@ -136,7 +136,7 @@ describe 'function query' do
         multiplicative_boost(function { 10.5 }^5)
       end
     end
-    connection.should have_last_search_including(:boost, '10.5^5')
+    expect(connection).to have_last_search_including(:boost, '10.5^5')
   end
 
   it "should handle multiplicative boost function with time literal" do
@@ -145,7 +145,7 @@ describe 'function query' do
         multiplicative_boost(function { Time.parse('2010-03-25 14:13:00 EDT') })
       end
     end
-    connection.should have_last_search_including(:boost, '2010-03-25T18:13:00Z')
+    expect(connection).to have_last_search_including(:boost, '2010-03-25T18:13:00Z')
   end
  
   it "should handle arbitrary functions in a function query block" do
@@ -154,7 +154,7 @@ describe 'function query' do
         multiplicative_boost(function { product(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:boost, 'product(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:boost, 'product(average_rating_ft,10)')
   end
 
   it "should handle the sub function in a multiplicative boost function query block" do
@@ -163,7 +163,7 @@ describe 'function query' do
         multiplicative_boost(function { sub(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:boost, 'sub(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:boost, 'sub(average_rating_ft,10)')
   end
 
   it "should handle boost amounts on multiplicative boost function query block" do
@@ -172,7 +172,7 @@ describe 'function query' do
         multiplicative_boost(function { sub(:average_rating, 10)^5 })
       end
     end
-    connection.should have_last_search_including(:boost, 'sub(average_rating_ft,10)^5')
+    expect(connection).to have_last_search_including(:boost, 'sub(average_rating_ft,10)^5')
   end
  
   it "should handle nested functions in a multiplicative boost function query block" do
@@ -181,28 +181,28 @@ describe 'function query' do
         multiplicative_boost(function { product(:average_rating, sum(:average_rating, 20)) })
       end
     end
-    connection.should have_last_search_including(:boost, 'product(average_rating_ft,sum(average_rating_ft,20))')
+    expect(connection).to have_last_search_including(:boost, 'product(average_rating_ft,sum(average_rating_ft,20))')
   end
 
   # TODO SOLR 1.5
   it "should raise ArgumentError if string literal passed to multiplicative boost" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           multiplicative_boost(function { "hello world" })
         end
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it "should raise UnrecognizedFieldError if bogus field name passed to multiplicative boost" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           multiplicative_boost(function { :bogus })
         end
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
 end

data/spec/api/query/geo_examples.rb

@@ -5,35 +5,35 @@ shared_examples_for 'geohash query' do
     search do
       with(:coordinates).near(40.7, -73.5)
     end
-    connection.should have_last_search_including(:q, build_geo_query)
+    expect(connection).to have_last_search_including(:q, build_geo_query)
   end
 
   it 'searches for nearby points with non-Float arguments' do
     search do
       with(:coordinates).near(BigDecimal.new('40.7'), BigDecimal.new('-73.5'))
     end
-    connection.should have_last_search_including(:q, build_geo_query)
+    expect(connection).to have_last_search_including(:q, build_geo_query)
   end
 
   it 'searches for nearby points with given precision' do
     search do
       with(:coordinates).near(40.7, -73.5, :precision => 10)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:precision => 10))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:precision => 10))
   end
 
   it 'searches for nearby points with given precision factor' do
     search do
       with(:coordinates).near(40.7, -73.5, :precision_factor => 1.5)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:precision_factor => 1.5))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:precision_factor => 1.5))
   end
 
   it 'searches for nearby points with given boost' do
     search do
       with(:coordinates).near(40.7, -73.5, :boost => 2.0)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:boost => 2.0))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:boost => 2.0))
   end
 
   it 'performs both dismax search and location search' do
@@ -42,7 +42,7 @@ shared_examples_for 'geohash query' do
       with(:coordinates).near(40.7, -73.5)
     end
     expected = %Q((_query_:"{!edismax qf='title_text'}pizza" AND (#{build_geo_query})))
-    connection.should have_last_search_including(:q, expected)
+    expect(connection).to have_last_search_including(:q, expected)
   end
 
   private