sunspot 2.2.7 → 2.5.0

data/spec/api/query/scope_examples.rb

@@ -3,14 +3,14 @@ shared_examples_for "scoped query" do
     search do
       with :title, 'My Pet Post'
     end
-    connection.should have_last_search_including(:fq, 'title_ss:My\ Pet\ Post')
+    expect(connection).to have_last_search_including(:fq, 'title_ss:My\ Pet\ Post')
   end
 
   it 'scopes by exact match with a special string' do
     search do
       with :title, 'OR'
     end
-    connection.should have_last_search_including(:fq, 'title_ss:"OR"')
+    expect(connection).to have_last_search_including(:fq, 'title_ss:"OR"')
   end
 
   it 'scopes by exact match with time' do
@@ -18,7 +18,7 @@ shared_examples_for "scoped query" do
     search do
       with :published_at, time
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       'published_at_dt:1983\-07\-08T09\:00\:00Z'
     )
@@ -29,7 +29,7 @@ shared_examples_for "scoped query" do
     search do
       with :expire_date, date
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       'expire_date_d:1983\-07\-08T00\:00\:00Z'
     )
@@ -39,133 +39,133 @@ shared_examples_for "scoped query" do
     search do
       with :featured, false
     end
-    connection.should have_last_search_including(:fq, 'featured_bs:false')
+    expect(connection).to have_last_search_including(:fq, 'featured_bs:false')
   end
 
   it 'scopes by less than match with float' do
     search do
       with(:average_rating).less_than 3.0
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:{* TO 3\.0}')
+    expect(connection).to have_last_search_including(:fq, 'average_rating_ft:{* TO 3\.0}')
   end
 
   it 'should quote string with space in a less than match' do
     search do
       with(:title).less_than('test value')
     end
-    connection.should have_last_search_including(:fq, 'title_ss:{* TO "test\ value"}')
+    expect(connection).to have_last_search_including(:fq, 'title_ss:{* TO "test\ value"}')
   end
 
   it 'scopes by greater than match with float' do
     search do
       with(:average_rating).greater_than 3.0
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:{3\.0 TO *}')
+    expect(connection).to have_last_search_including(:fq, 'average_rating_ft:{3\.0 TO *}')
   end
 
   it 'scopes by short-form between match with integers' do
     search do
       with :blog_id, 2..4
     end
-    connection.should have_last_search_including(:fq, 'blog_id_i:[2 TO 4]')
+    expect(connection).to have_last_search_including(:fq, 'blog_id_i:[2 TO 4]')
   end
 
   it 'scopes by between match with float' do
     search do
       with(:average_rating).between 2.0..4.0
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:[2\.0 TO 4\.0]')
+    expect(connection).to have_last_search_including(:fq, 'average_rating_ft:[2\.0 TO 4\.0]')
   end
 
   it 'scopes by any match with integer' do
     search do
       with(:category_ids).any_of [2, 7, 12]
     end
-    connection.should have_last_search_including(:fq, 'category_ids_im:(2 OR 7 OR 12)')
+    expect(connection).to have_last_search_including(:fq, 'category_ids_im:(2 OR 7 OR 12)')
   end
 
   it 'scopes by short-form any-of match with integers' do
     search do
       with :category_ids, [2, 7, 12]
     end
-    connection.should have_last_search_including(:fq, 'category_ids_im:(2 OR 7 OR 12)')
+    expect(connection).to have_last_search_including(:fq, 'category_ids_im:(2 OR 7 OR 12)')
   end
 
   it 'scopes by all match with integer' do
     search do
       with(:category_ids).all_of [2, 7, 12]
     end
-    connection.should have_last_search_including(:fq, 'category_ids_im:(2 AND 7 AND 12)')
+    expect(connection).to have_last_search_including(:fq, 'category_ids_im:(2 AND 7 AND 12)')
   end
 
   it 'scopes by prefix match with string' do
     search do
       with(:title).starting_with('tes')
     end
-    connection.should have_last_search_including(:fq, 'title_ss:tes*')
+    expect(connection).to have_last_search_including(:fq, 'title_ss:tes*')
   end
 
   it 'scopes by not equal match with string' do
     search do
       without :title, 'Bad Post'
     end
-    connection.should have_last_search_including(:fq, '-title_ss:Bad\ Post')
+    expect(connection).to have_last_search_including(:fq, '-title_ss:Bad\ Post')
   end
 
   it 'scopes by not less than match with float' do
     search do
       without(:average_rating).less_than 3.0
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:{* TO 3\.0}')
+    expect(connection).to have_last_search_including(:fq, '-average_rating_ft:{* TO 3\.0}')
   end
 
   it 'scopes by not greater than match with float' do
     search do
       without(:average_rating).greater_than 3.0
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:{3\.0 TO *}')
+    expect(connection).to have_last_search_including(:fq, '-average_rating_ft:{3\.0 TO *}')
   end
   
   it 'scopes by not between match with shorthand' do
     search do
       without(:blog_id, 2..4)
     end
-    connection.should have_last_search_including(:fq, '-blog_id_i:[2 TO 4]')
+    expect(connection).to have_last_search_including(:fq, '-blog_id_i:[2 TO 4]')
   end
 
   it 'scopes by not between match with float' do
     search do
       without(:average_rating).between 2.0..4.0
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:[2\.0 TO 4\.0]')
+    expect(connection).to have_last_search_including(:fq, '-average_rating_ft:[2\.0 TO 4\.0]')
   end
 
   it 'scopes by not any match with integer' do
     search do
       without(:category_ids).any_of [2, 7, 12]
     end
-    connection.should have_last_search_including(:fq, '-category_ids_im:(2 OR 7 OR 12)')
+    expect(connection).to have_last_search_including(:fq, '-category_ids_im:(2 OR 7 OR 12)')
   end
 
   it 'scopes by not all match with integer' do
     search do
       without(:category_ids).all_of [2, 7, 12]
     end
-    connection.should have_last_search_including(:fq, '-category_ids_im:(2 AND 7 AND 12)')
+    expect(connection).to have_last_search_including(:fq, '-category_ids_im:(2 AND 7 AND 12)')
   end
 
   it 'scopes by empty field' do
     search do
       with :average_rating, nil
     end
-    connection.should have_last_search_including(:fq, '-average_rating_ft:[* TO *]')
+    expect(connection).to have_last_search_including(:fq, '-average_rating_ft:[* TO *]')
   end
 
   it 'scopes by non-empty field' do
     search do
       without :average_rating, nil
     end
-    connection.should have_last_search_including(:fq, 'average_rating_ft:[* TO *]')
+    expect(connection).to have_last_search_including(:fq, 'average_rating_ft:[* TO *]')
   end
 
   it 'includes by object identity' do
@@ -173,7 +173,7 @@ shared_examples_for "scoped query" do
     search do
       with post
     end
-    connection.should have_last_search_including(:fq, "id:(Post\\ #{post.id})")
+    expect(connection).to have_last_search_including(:fq, "id:(Post\\ #{post.id})")
   end
 
   it 'includes multiple objects passed as varargs by object identity' do
@@ -181,7 +181,7 @@ shared_examples_for "scoped query" do
     search do
       with post1, post2
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "id:(Post\\ #{post1.id} OR Post\\ #{post2.id})"
     )
   end
@@ -191,7 +191,7 @@ shared_examples_for "scoped query" do
     search do
       with posts
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "id:(Post\\ #{posts.first.id} OR Post\\ #{posts.last.id})"
     )
   end
@@ -201,7 +201,7 @@ shared_examples_for "scoped query" do
     search do
       without post
     end
-    connection.should have_last_search_including(:fq, "-id:(Post\\ #{post.id})")
+    expect(connection).to have_last_search_including(:fq, "-id:(Post\\ #{post.id})")
   end
 
   it 'excludes multiple objects passed as varargs by object identity' do
@@ -209,7 +209,7 @@ shared_examples_for "scoped query" do
     search do
       without post1, post2
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       "-id:(Post\\ #{post1.id} OR Post\\ #{post2.id})"
     )
@@ -220,7 +220,7 @@ shared_examples_for "scoped query" do
     search do
       without posts
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       "-id:(Post\\ #{posts.first.id} OR Post\\ #{posts.last.id})"
     )
@@ -231,45 +231,45 @@ shared_examples_for "scoped query" do
     search Post, Namespaced::Comment do
       with :published_at, time
     end
-    connection.should have_last_search_including(:fq, 'published_at_dt:1983\-07\-08T09\:00\:00Z')
+    expect(connection).to have_last_search_including(:fq, 'published_at_dt:1983\-07\-08T09\:00\:00Z')
   end
 
   it 'allows scoping on field not common to all types' do
     search Post, Namespaced::Comment 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 'raises Sunspot::UnrecognizedFieldError if search scoped to field configured differently between types' do
-    lambda do
+    expect do
       search Post, Namespaced::Comment do
         with :average_rating, 2.2 # this is a float in Post but an integer in Comment
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'raises Sunspot::UnrecognizedFieldError for nonexistant fields in block scope' do
-    lambda do
+    expect do
       search do
         with :bogus, 'Field'
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'raises NoMethodError if bogus operator referenced' do
-    lambda do
+    expect do
       search do
         with(:category_ids).resembling :bogus_condition
       end
-    end.should raise_error(NoMethodError)
+    end.to raise_error(NoMethodError)
   end
 
   it 'should raise ArgumentError if more than two arguments passed to scope method' do
-    lambda do
+    expect do
       search do
         with(:category_ids, 4, 5)
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 end

data/spec/api/query/spatial_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for "spatial query" do
       with(:coordinates_new).in_radius(23, -46, 100)
     end
 
-    connection.should have_last_search_including(:fq, "{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}")
+    expect(connection).to have_last_search_including(:fq, "{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}")
   end
 
   it 'filters by radius via bbox (inexact)' do
@@ -14,7 +14,7 @@ shared_examples_for "spatial query" do
       with(:coordinates_new).in_radius(23, -46, 100, :bbox => true)
     end
 
-    connection.should have_last_search_including(:fq, "{!bbox sfield=coordinates_new_ll pt=23,-46 d=100}")
+    expect(connection).to have_last_search_including(:fq, "{!bbox sfield=coordinates_new_ll pt=23,-46 d=100}")
   end
 
   it 'filters by bounding box' do
@@ -22,6 +22,6 @@ shared_examples_for "spatial query" do
       with(:coordinates_new).in_bounding_box([45, -94], [46, -93])
     end
 
-    connection.should have_last_search_including(:fq, "coordinates_new_ll:[45,-94 TO 46,-93]")
+    expect(connection).to have_last_search_including(:fq, "coordinates_new_ll:[45,-94 TO 46,-93]")
   end
 end

data/spec/api/query/spellcheck_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for 'spellcheck query' do
     search do
       spellcheck
     end
-    connection.should have_last_search_including(:spellcheck, true)
+    expect(connection).to have_last_search_including(:spellcheck, true)
   end
 
 
@@ -14,7 +14,7 @@ shared_examples_for 'spellcheck query' do
     search do
       spellcheck :only_more_popular => true, :count => 5
     end
-    connection.should have_last_search_including('spellcheck.onlyMorePopular', true)
-    connection.should have_last_search_including('spellcheck.count', 5)
+    expect(connection).to have_last_search_including('spellcheck.onlyMorePopular', true)
+    expect(connection).to have_last_search_including('spellcheck.count', 5)
   end
 end

data/spec/api/query/standard_spec.rb

@@ -19,7 +19,7 @@ describe 'standard query', :type => :query do
     session.search Post do
       with :title, 'My Pet Post'
     end
-    connection.should have_last_search_with(:q => '*:*')
+    expect(connection).to have_last_search_with(:q => '*:*')
   end
 
   private

data/spec/api/query/stats_examples.rb

@@ -1,28 +1,28 @@
 shared_examples_for 'stats query' do
   it 'does not use stats unless requested' do
     search
-    connection.should_not have_last_search_with(:stats)
+    expect(connection).not_to have_last_search_with(:stats)
   end
 
   it 'uses stats when requested' do
     search do
       stats :average_rating
     end
-    connection.should have_last_search_with(:stats => true)
+    expect(connection).to have_last_search_with(:stats => true)
   end
 
   it 'requests single field stats' do
     search do
       stats :average_rating
     end
-    connection.should have_last_search_with(:"stats.field" => %w{average_rating_ft})
+    expect(connection).to have_last_search_with(:"stats.field" => %w{average_rating_ft})
   end
 
   it 'requests multiple field stats' do
     search do
       stats :average_rating, :published_at
     end
-    connection.should have_last_search_with(:"stats.field" => %w{average_rating_ft published_at_dt})
+    expect(connection).to have_last_search_with(:"stats.field" => %w{average_rating_ft published_at_dt})
   end
 
   it 'facets on a stats field' do
@@ -31,14 +31,14 @@ shared_examples_for 'stats query' do
         facet :featured
       end
     end
-    connection.should have_last_search_with(:"f.average_rating_ft.stats.facet" => %w{featured_bs})
+    expect(connection).to have_last_search_with(:"f.average_rating_ft.stats.facet" => %w{featured_bs})
   end
 
   it 'only facets on a stats field when requested' do
     search do
       stats :average_rating
     end
-    connection.should_not have_last_search_with(:"f.average_rating_ft.stats.facet")
+    expect(connection).not_to have_last_search_with(:"f.average_rating_ft.stats.facet")
   end
 
   it 'facets on multiple stats fields' do
@@ -47,7 +47,7 @@ shared_examples_for 'stats query' do
         facet :featured
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.average_rating_ft.stats.facet" => %w{featured_bs},
       :"f.published_at_dt.stats.facet" => %w{featured_bs}
     )
@@ -59,7 +59,7 @@ shared_examples_for 'stats query' do
         facet :featured, :primary_category_id
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.average_rating_ft.stats.facet" => %w{featured_bs primary_category_id_i}
     )
   end

data/spec/api/query/text_field_scoping_examples.rb

@@ -5,26 +5,26 @@ shared_examples_for 'query with text field scoping' do
         with(:body, 'test')
       end
     end
-    connection.should have_last_search_including(:fq, 'body_textsv:test')
+    expect(connection).to have_last_search_including(:fq, 'body_textsv:test')
   end
 
   it 'should raise an UnrecognizedFieldError if differently configured text field is used' do
-    lambda do
+    expect do
       search(Post, Namespaced::Comment) do
         text_fields do
           with(:body, 'test')
         end
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should raise an UnrecognizedFieldError if no field exists' do
-    lambda do
+    expect do
       search do
         text_fields do
           with(:bogus, 'test')
         end
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 end

data/spec/api/query/types_spec.rb

@@ -1,20 +1,20 @@
 describe 'typed query' do
   it 'properly escapes namespaced type names' do
     session.search(Namespaced::Comment)
-    connection.should have_last_search_with(:fq => ['type:Namespaced\:\:Comment'])
+    expect(connection).to have_last_search_with(:fq => ['type:Namespaced\:\:Comment'])
   end
 
   it 'builds search for multiple types' do
     session.search(Post, Namespaced::Comment)
-    connection.should have_last_search_with(:fq => ['type:(Post OR Namespaced\:\:Comment)'])
+    expect(connection).to have_last_search_with(:fq => ['type:(Post OR Namespaced\:\:Comment)'])
   end
 
   it 'searches type of subclass when superclass is configured' do
     session.search PhotoPost
-    connection.should have_last_search_with(:fq => ['type:PhotoPost'])
+    expect(connection).to have_last_search_with(:fq => ['type:PhotoPost'])
   end
 
   it 'raises an ArgumentError if no types given to search' do
-    lambda { session.search }.should raise_error(ArgumentError)
+    expect { session.search }.to raise_error(ArgumentError)
   end
 end

data/spec/api/search/cursor_paginated_collection_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 describe "CursorPaginatedCollection" do
   subject { Sunspot::Search::CursorPaginatedCollection.new [], 10, 20, '*', 'AoIIP4AAACxQcm9maWxlIDEwMTk=' }
 
-  it { subject.should be_an(Array) }
+  it { expect(subject).to be_an(Array) }
 
   describe "#send" do
     it 'should allow send' do
@@ -13,23 +13,23 @@ describe "CursorPaginatedCollection" do
 
   describe "#respond_to?" do
     it 'should return true for current_cursor' do
-      subject.respond_to?(:current_cursor).should be_true
+      expect(subject.respond_to?(:current_cursor)).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_cursor.should eql('*') }
-    it { subject.per_page.should eql(10) }
-    it { subject.next_page_cursor.should eql('AoIIP4AAACxQcm9maWxlIDEwMTk=') }
+    it { expect(subject.total_entries).to eql(20) }
+    it { expect(subject.total_pages).to eql(2) }
+    it { expect(subject.current_cursor).to eql('*') }
+    it { expect(subject.per_page).to eql(10) }
+    it { expect(subject.next_page_cursor).to eql('AoIIP4AAACxQcm9maWxlIDEwMTk=') }
   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 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?).to be(true) }
   end
 end

data/spec/api/search/dynamic_fields_spec.rb

@@ -4,13 +4,13 @@ describe 'search with dynamic fields' do
   it 'returns dynamic string facet' do
     stub_facet(:"custom_string:test_ss", 'two' => 2, 'one' => 1)
     result = session.search(Post) { dynamic(:custom_string) { facet(:test) }}
-    result.facet(:custom_string, :test).rows.map { |row| row.value }.should == ['two', 'one']
+    expect(result.facet(:custom_string, :test).rows.map { |row| row.value }).to eq(['two', 'one'])
   end
 
   it 'returns dynamic field facet with custom label' do
     stub_facet(:"bogus", 'two' => 2, 'one' => 1)
     result = session.search(Post) { dynamic(:custom_string) { facet(:test, :name => :bogus) }}
-    result.facet(:bogus).rows.map { |row| row.value }.should == ['two', 'one']
+    expect(result.facet(:bogus).rows.map { |row| row.value }).to eq(['two', 'one'])
   end
 
   it 'returns query facet specified in dynamic call' do
@@ -27,7 +27,7 @@ describe 'search with dynamic fields' do
       end
     end
     facet = search.facet(:test)
-    facet.rows.first.value.should == :foo_bar
-    facet.rows.first.count.should == 3
+    expect(facet.rows.first.value).to eq(:foo_bar)
+    expect(facet.rows.first.count).to eq(3)
   end
 end