sunspot 2.2.7 → 2.2.8

data/spec/api/indexer_spec.rb

@@ -7,8 +7,8 @@ describe 'indexer', :type => :indexer do
     Object.class_eval { remove_const(:ReloadableClass) }
     Object::ReloadableClass = Class.new(MockRecord)
     Sunspot.setup(ReloadableClass) {}
-    lambda do
+    expect do
       Sunspot.search(ReloadableClass) { with(:title, 'title') }
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 end

data/spec/api/query/advanced_manipulation_examples.rb

@@ -12,11 +12,11 @@ shared_examples_for "query with advanced manipulation" do
     end
 
     it "modifies existing param" do
-      connection.should have_last_search_with(:rows  => 40)
+      expect(connection).to have_last_search_with(:rows  => 40)
     end
 
     it "adds new param" do
-      connection.should have_last_search_with(:qt => 'complicated')
+      expect(connection).to have_last_search_with(:qt => 'complicated')
     end
   end
 
@@ -29,7 +29,7 @@ shared_examples_for "query with advanced manipulation" do
     end
 
     it 'should use specified request handler' do
-      connection.should have_last_search_with({})
+      expect(connection).to have_last_search_with({})
     end
   end
 end

data/spec/api/query/connectives_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for "query with connective scope" do
         with :blog_id, 2
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(category_ids_im:1 OR blog_id_i:2)'
     )
   end
@@ -21,7 +21,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_ft:{3\.0 TO *}))'
     )
@@ -37,7 +37,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(category_ids_im:1 OR (-average_rating_ft:{3\.0 TO *} AND blog_id_i:1))'
     )
   end
@@ -49,7 +49,7 @@ shared_examples_for "query with connective scope" do
         with :category_ids, 1
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, 'blog_id_i:2', 'category_ids_im:1'
     )
   end
@@ -61,7 +61,7 @@ shared_examples_for "query with connective scope" do
         without(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(-category_ids_im:1 AND average_rating_ft:{3\.0 TO *})'
     )
   end
@@ -79,7 +79,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
@@ -96,7 +96,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
@@ -123,7 +123,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_ss:Yes OR blog_id_i:1 OR category_ids_im:4)'
     )
   end
@@ -136,7 +136,7 @@ shared_examples_for "query with connective scope" do
         with(:category_ids, 1)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "-(id:(Post\\ #{post.id}) AND -category_ids_im:1)"
     )
   end
@@ -148,7 +148,7 @@ shared_examples_for "query with connective scope" do
         with(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(average_rating_ft:[* TO *] AND -average_rating_ft:{3\.0 TO *})'
     )
   end
@@ -161,7 +161,7 @@ shared_examples_for "query with connective scope" do
         with(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "(id:(Post\\ #{post.id}) OR average_rating_ft:{3\\.0 TO *})"
     )
   end
@@ -175,7 +175,7 @@ shared_examples_for "query with connective scope" do
         with(:blog_id, 1)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_text:test* OR blog_id_i:1)'
     )
   end
@@ -184,7 +184,7 @@ shared_examples_for "query with connective scope" do
     search do
       any_of {}
     end
-    connection.should_not have_last_search_including(:fq, '')
+    expect(connection).not_to have_last_search_including(:fq, '')
   end
 
   it 'creates a conjunction of in_radius queries' do
@@ -194,8 +194,20 @@ shared_examples_for "query with connective scope" do
         with(:coordinates_new).in_radius(42, 56, 50)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(_query_:"{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}" OR _query_:"{!geofilt sfield=coordinates_new_ll pt=42,56 d=50}")'
     )
   end
+  
+  it 'creates a conjunction of in_bounding_box queries' do
+    search do
+      any_of do
+        with(:coordinates_new).in_bounding_box([23, -46], [25, -44])
+        with(:coordinates_new).in_bounding_box([42, 56], [43, 58])
+      end
+    end
+    expect(connection).to have_last_search_including(
+      :fq, '(coordinates_new_ll:[23,-46 TO 25,-44] OR coordinates_new_ll:[42,56 TO 43,58])'
+    )
+  end
 end

data/spec/api/query/dsl_spec.rb

@@ -1,28 +1,36 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'query DSL', :type => :query do
+  let(:blog_id) { 1 }
+
   it 'should allow building search using block argument rather than instance_eval' do
-    @blog_id = 1
     session.search Post do |query|
       query.field_list [:blog_id, :title]
-      query.with(:blog_id, @blog_id)
+      query.with(:blog_id, blog_id)
     end
-    connection.should have_last_search_including(:fq, 'blog_id_i:1')
-    connection.should have_last_search_with(fl: [:blog_id, :title])
+    expect(connection).to have_last_search_including(:fq, 'blog_id_i:1')
+    expect(connection).to have_last_search_with(fl: [:id, :blog_id_i, :title_ss])
   end
 
   it 'should allow field_list specified as arguments' do
-    @blog_id = 1
     session.search Post do |query|
       query.field_list :blog_id, :title
-      query.with(:blog_id, @blog_id)
+      query.with(:blog_id, blog_id)
+    end
+    expect(connection).to have_last_search_with(fl: [:id, :blog_id_i, :title_ss])
+  end
+
+  it 'should allow to skip stored fields retrieval' do
+    session.search Post do |query|
+      query.with(:blog_id, blog_id)
+      query.without_stored_fields
     end
-    connection.should have_last_search_with(fl: [:blog_id, :title])
+    expect(connection).to have_last_search_with(fl: [:id])
   end
 
   it 'should accept a block in the #new_search method' do
-    search = session.new_search(Post) { with(:blog_id, 1) }
+    search = session.new_search(Post) { with(:blog_id, blog_id) }
     search.execute
-    connection.should have_last_search_including(:fq, 'blog_id_i:1')
+    expect(connection).to have_last_search_including(:fq, 'blog_id_i:1')
   end
 end

data/spec/api/query/dynamic_fields_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for "query with dynamic field support" do
         with :test, 'string'
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_string\:test_ss:string')
+    expect(connection).to have_last_search_including(:fq, 'custom_string\:test_ss:string')
   end
 
   it 'restricts by dynamic integer field with less than restriction' do
@@ -14,7 +14,7 @@ shared_examples_for "query with dynamic field support" do
         with(:test).less_than(1)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_integer\:test_i:{* TO 1}')
+    expect(connection).to have_last_search_including(:fq, 'custom_integer\:test_i:{* TO 1}')
   end
 
   it 'restricts by dynamic float field with between restriction' do
@@ -23,7 +23,7 @@ shared_examples_for "query with dynamic field support" do
         with(:test).between(2.2..3.3)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_float\:test_fm:[2\.2 TO 3\.3]')
+    expect(connection).to have_last_search_including(:fq, 'custom_float\:test_fm:[2\.2 TO 3\.3]')
   end
 
   it 'restricts by dynamic time field with any of restriction' do
@@ -33,7 +33,7 @@ shared_examples_for "query with dynamic field support" do
                             Time.parse('2009-02-13 18:00:00 UTC')])
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_time\:test_d:(2009\-02\-10T14\:00\:00Z OR 2009\-02\-13T18\:00\:00Z)')
+    expect(connection).to have_last_search_including(:fq, 'custom_time\:test_d:(2009\-02\-10T14\:00\:00Z OR 2009\-02\-13T18\:00\:00Z)')
   end
 
   it 'restricts by dynamic boolean field with equality restriction' do
@@ -42,7 +42,7 @@ shared_examples_for "query with dynamic field support" do
         with :test, false
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_boolean\:test_b:false')
+    expect(connection).to have_last_search_including(:fq, 'custom_boolean\:test_b:false')
   end
 
   it 'negates a dynamic field restriction' do
@@ -51,7 +51,7 @@ shared_examples_for "query with dynamic field support" do
         without :test, 'foo'
       end
     end
-    connection.should have_last_search_including(:fq, '-custom_string\:test_ss:foo')
+    expect(connection).to have_last_search_including(:fq, '-custom_string\:test_ss:foo')
   end
 
   it 'scopes by a dynamic field inside a disjunction' do
@@ -63,7 +63,7 @@ shared_examples_for "query with dynamic field support" do
         with :title, 'bar'
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(custom_string\:test_ss:foo OR title_ss:bar)'
     )
   end
@@ -74,7 +74,7 @@ shared_examples_for "query with dynamic field support" do
         order_by :test, :desc
       end
     end
-    connection.should have_last_search_with(:sort => 'custom_integer:test_i desc')
+    expect(connection).to have_last_search_with(:sort => 'custom_integer:test_i desc')
   end
 
   it 'orders by a dynamic field and static field, with given precedence' do
@@ -84,25 +84,25 @@ shared_examples_for "query with dynamic field support" do
       end
       order_by :sort_title, :asc
     end
-    connection.should have_last_search_with(:sort => 'custom_integer:test_i desc, sort_title_s asc')
+    expect(connection).to have_last_search_with(:sort => 'custom_integer:test_i desc, sort_title_s asc')
   end
 
   it 'raises an UnrecognizedFieldError if an unknown dynamic field is searched by' do
-    lambda do
+    expect do
       search do
         dynamic(:bogus) { with :some, 'value' }
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'raises a NoMethodError if pagination is attempted in a dynamic query' do
-    lambda do
+    expect do
       search do
         dynamic :custom_string do
           paginate :page => 3, :per_page => 10
         end
       end
-    end.should raise_error(NoMethodError)
+    end.to raise_error(NoMethodError)
   end
 
   it 'requests field facet on dynamic field' do
@@ -111,7 +111,7 @@ shared_examples_for "query with dynamic field support" do
         facet(:test)
       end
     end
-    connection.should have_last_search_including(:"facet.field", 'custom_string:test_ss')
+    expect(connection).to have_last_search_including(:"facet.field", 'custom_string:test_ss')
   end
 
   it 'requests named field facet on dynamic field' do
@@ -120,7 +120,7 @@ shared_examples_for "query with dynamic field support" do
         facet(:test, :name => :bogus)
       end
     end
-    connection.should have_last_search_including(:"facet.field", '{!key=bogus}custom_string:test_ss')
+    expect(connection).to have_last_search_including(:"facet.field", '{!key=bogus}custom_string:test_ss')
   end
 
   it 'requests query facet with internal dynamic field' do
@@ -133,7 +133,7 @@ shared_examples_for "query with dynamic field support" do
         end
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"facet.query" => 'custom_string\:test_ss:foo'
     )
   end
@@ -148,7 +148,7 @@ shared_examples_for "query with dynamic field support" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :"facet.query",
       'custom_string\:test_ss:foo'
     )
@@ -160,6 +160,6 @@ shared_examples_for "query with dynamic field support" do
         with(:test, 1.23)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_float\\:test_fm:1\\.23')
+    expect(connection).to have_last_search_including(:fq, 'custom_float\\:test_fm:1\\.23')
   end
 end

data/spec/api/query/faceting_examples.rb

@@ -2,114 +2,114 @@ shared_examples_for "facetable query" do
   describe 'on fields' do
     it 'does not turn faceting on if no facet requested' do
       search
-      connection.should_not have_last_search_with('facet')
+      expect(connection).not_to have_last_search_with('facet')
     end
 
     it 'turns faceting on if facet is requested' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:facet => 'true')
+      expect(connection).to have_last_search_with(:facet => 'true')
     end
 
     it 'requests single field facet' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:"facet.field" => %w(category_ids_im))
+      expect(connection).to have_last_search_with(:"facet.field" => %w(category_ids_im))
     end
 
     it 'requests multiple field facets' do
       search do
         facet :category_ids, :blog_id
       end
-      connection.should have_last_search_with(:"facet.field" => %w(category_ids_im blog_id_i))
+      expect(connection).to have_last_search_with(:"facet.field" => %w(category_ids_im blog_id_i))
     end
 
     it 'sets facet sort by count' do
       search do
         facet :category_ids, :sort => :count
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.sort" => 'true')
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.sort" => 'true')
     end
 
     it 'sets facet sort by index' do
       search do
         facet :category_ids, :sort => :index
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.sort" => 'false')
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.sort" => 'false')
     end
 
     it 'raises ArgumentError if bogus facet sort provided' do
-      lambda do
+      expect do
         search do
           facet :category_ids, :sort => :sideways
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'sets the facet limit' do
       search do
         facet :category_ids, :limit => 10
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.limit" => 10)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.limit" => 10)
     end
     
     it 'sets the facet offset' do
       search do
         facet :category_ids, :offset => 10
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.offset" => 10)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.offset" => 10)
     end
 
     it 'sets the facet minimum count' do
       search do
         facet :category_ids, :minimum_count => 5
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 5)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 5)
     end
 
     it 'sets the facet minimum count to zero if zeros are allowed' do
       search do
         facet :category_ids, :zeros => true
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 0)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 0)
     end
 
     it 'sets the facet minimum count to one by default' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 1)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 1)
     end
 
     it 'sets the facet prefix' do
       search do
         facet :title, :prefix => 'Test'
       end
-      connection.should have_last_search_with(:"f.title_ss.facet.prefix" => 'Test')
+      expect(connection).to have_last_search_with(:"f.title_ss.facet.prefix" => 'Test')
     end
     
     it 'sends a query facet for :any extra' do
       search do
         facet :category_ids, :extra => :any
       end
-      connection.should have_last_search_with(:"facet.query" => "category_ids_im:[* TO *]")
+      expect(connection).to have_last_search_with(:"facet.query" => "category_ids_im:[* TO *]")
     end
 
     it 'sends a query facet for :none extra' do
       search do
         facet :category_ids, :extra => :none
       end
-      connection.should have_last_search_with(:"facet.query" => "-category_ids_im:[* TO *]")
+      expect(connection).to have_last_search_with(:"facet.query" => "-category_ids_im:[* TO *]")
     end
 
     it 'raises an ArgumentError if bogus extra is passed' do
-      lambda do
+      expect do
         search do
           facet :category_ids, :extra => :bogus
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'tags and excludes a geofilt in a field facet' do
@@ -126,7 +126,7 @@ shared_examples_for "facetable query" do
       else
         filter_tag = get_filter_tag('{!geofilt sfield=coordinates_new_ll pt=32,-68 d=1}')
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tag}}_query_:\"{!geofilt sfield=coordinates_new_ll pt=32,-68 d=10}\""
       )
     end
@@ -137,7 +137,7 @@ shared_examples_for "facetable query" do
         facet(:blog_id, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
       )
     end
@@ -151,7 +151,7 @@ shared_examples_for "facetable query" do
         facet(:blog_id, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
       )
     end
@@ -165,7 +165,7 @@ shared_examples_for "facetable query" do
       filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
         get_filter_tag(phrase)
       end.join(',')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tags}}blog_id_i)
       )
     end
@@ -174,39 +174,39 @@ shared_examples_for "facetable query" do
       search do
         with(:blog_id, 1)
       end
-      connection.should have_last_search_including(:fq, "blog_id_i:1")
+      expect(connection).to have_last_search_including(:fq, "blog_id_i:1")
     end
 
     it 'names a field facet' do
       search do
         facet(:blog_id, :name => :blog)
       end
-      connection.should have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
+      expect(connection).to have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
     end
 
     it 'uses the custom field facet name in facet option parameters' do
       search do
         facet(:blog_id, :name => :blog, :sort => :count)
       end
-      connection.should have_last_search_with(:"f.blog.facet.sort" => 'true')
+      expect(connection).to have_last_search_with(:"f.blog.facet.sort" => 'true')
     end
 
     it 'raises an ArgumentError if exclusion attempted on a restricted field facet' do
-      lambda do
+      expect do
         search do
           blog_filter = with(:blog_id, 1)
           facet(:blog_id, :only => 1, :exclude => blog_filter)
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'raises an ArgumentError if exclusion attempted on a facet with :extra' do
-      lambda do
+      expect do
         search do
           blog_filter = with(:blog_id, 1)
           facet(:blog_id, :extra => :all, :exclude => blog_filter)
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -220,21 +220,21 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :published_at
       end
-      connection.should_not have_last_search_with(:"facet.date")
+      expect(connection).not_to have_last_search_with(:"facet.date")
     end
 
     it 'sets the facet to a date facet if time range is specified' do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(:"facet.date" => ['published_at_dt'])
+      expect(connection).to have_last_search_with(:"facet.date" => ['published_at_dt'])
     end
 
     it 'sets the facet start and end' do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"f.published_at_dt.facet.date.start" => '2009-06-01T04:00:00Z',
         :"f.published_at_dt.facet.date.end" => '2009-07-01T04:00:00Z'
       )
@@ -244,22 +244,22 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+86400SECONDS")
+      expect(connection).to have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+86400SECONDS")
     end
 
     it 'uses custom time interval' do
       search do |query|
         query.facet :published_at, :time_range => @time_range, :time_interval => 3600
       end
-      connection.should have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+3600SECONDS")
+      expect(connection).to have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+3600SECONDS")
     end
 
     it 'does not allow date faceting on a non-date field' do
-      lambda do
+      expect do
         search do |query|
           query.facet :blog_id, :time_range => @time_range
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -272,21 +272,21 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating
       end
-      connection.should_not have_last_search_with(:"facet.range")
+      expect(connection).not_to have_last_search_with(:"facet.range")
     end
 
     it 'sets the facet to a range facet if the range is specified' do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(:"facet.range" => ['average_rating_ft'])
+      expect(connection).to have_last_search_with(:"facet.range" => ['average_rating_ft'])
     end
 
     it 'sets the facet start and end' do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"f.average_rating_ft.facet.range.start" => '2.0',
         :"f.average_rating_ft.facet.range.end" => '4.0'
       )
@@ -296,14 +296,14 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "10")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "10")
     end
 
     it 'uses custom range interval' do
       search do |query|
         query.facet :average_rating, :range => @range, :range_interval => 1
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
     end
 
     it 'tags and excludes a scope filter in a range facet' do
@@ -312,7 +312,7 @@ shared_examples_for "facetable query" do
         query.facet(:average_rating, :range => @range, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.range" => %W({!ex=#{filter_tag}}average_rating_ft)
       )
     end
@@ -321,15 +321,15 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating, :range => @range, :include => :edge
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.include" => "edge")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.include" => "edge")
     end
 
     it 'does not allow date faceting on a non-continuous field' do
-      lambda do
+      expect do
         search do |query|
           query.facet :title, :range => @range
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -342,7 +342,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(:facet => 'true')
+      expect(connection).to have_last_search_with(:facet => 'true')
     end
 
     it 'facets by query' do
@@ -353,7 +353,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(:"facet.query" => 'average_rating_ft:[4\.0 TO 5\.0]')
+      expect(connection).to have_last_search_with(:"facet.query" => 'average_rating_ft:[4\.0 TO 5\.0]')
     end
 
     it 'requests multiple query facets' do
@@ -367,7 +367,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => [
           'average_rating_ft:[3\.0 TO 4\.0]',
           'average_rating_ft:[4\.0 TO 5\.0]'
@@ -384,7 +384,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => '(category_ids_im:1 AND blog_id_i:2)'
       )
     end
@@ -400,7 +400,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => '(category_ids_im:1 OR blog_id_i:2)'
       )
     end
@@ -409,7 +409,7 @@ shared_examples_for "facetable query" do
       search do
         facet :category_ids, :only => [1, 3]
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => ['category_ids_im:1', 'category_ids_im:3']
       )
     end
@@ -418,7 +418,7 @@ shared_examples_for "facetable query" do
       search do
         facet :published_at, :only => [Time.utc(2009, 8, 28, 15, 33), Time.utc(2008,8, 28, 15, 33)]
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => [
           'published_at_dt:2009\-08\-28T15\:33\:00Z',
           'published_at_dt:2008\-08\-28T15\:33\:00Z'
@@ -430,7 +430,7 @@ shared_examples_for "facetable query" do
       search do
         facet(:foo) {}
       end
-      connection.should_not have_last_search_with(:"facet.query")
+      expect(connection).not_to have_last_search_with(:"facet.query")
     end
 
     it 'ignores facet query row with no restrictions' do
@@ -442,7 +442,7 @@ shared_examples_for "facetable query" do
           row(:baz) {}
         end
       end
-      connection.searches.last[:"facet.query"].should be_a(String)
+      expect(connection.searches.last[:"facet.query"]).to be_a(String)
     end
 
     it 'tags and excludes a scope filter in a query facet' do
@@ -455,7 +455,7 @@ shared_examples_for "facetable query" do
         end
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
       )
     end
@@ -473,7 +473,7 @@ shared_examples_for "facetable query" do
         end
       end
       filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
       )
     end
@@ -491,7 +491,7 @@ shared_examples_for "facetable query" do
       filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
         get_filter_tag(phrase)
       end.join(',')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tags}}category_ids_im:1"
       )
     end
@@ -503,25 +503,25 @@ shared_examples_for "facetable query" do
           row(:bar) {}
         end
       end
-      connection.should_not have_last_search_with(:"facet.query")
+      expect(connection).not_to have_last_search_with(:"facet.query")
     end
 
     it 'does not allow 0 arguments to facet method with block' do
-      lambda do
+      expect do
         search do
           facet do
           end
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'does not allow more than 1 argument to facet method with block' do
-      lambda do
+      expect do
         search do
           facet :foo, :bar do
           end
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 end