thinking-sphinx 3.2.0 → 3.3.0

data/spec/acceptance/excerpts_spec.rb

@@ -10,8 +10,8 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search = Book.search('gods')
     search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
 
-    search.first.excerpts.title.
-      should == 'American <span class="match">Gods</span>'
+    expect(search.first.excerpts.title).
+      to eq('American <span class="match">Gods</span>')
   end
 
   it "handles UTF-8 text for excerpts" do
@@ -21,8 +21,8 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search = Book.search 'миръ'
     search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
 
-    search.first.excerpts.title.
-      should == 'Война и <span class="match">миръ</span>'
+    expect(search.first.excerpts.title).
+      to eq('Война и <span class="match">миръ</span>')
   end if ENV['SPHINX_VERSION'].try :[], /2.2.\d/
 
   it "does not include class names in excerpts" do
@@ -32,8 +32,8 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search = Book.search('graveyard')
     search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
 
-    search.first.excerpts.title.
-      should == 'The <span class="match">Graveyard</span> Book'
+    expect(search.first.excerpts.title).
+      to eq('The <span class="match">Graveyard</span> Book')
   end
 
   it "respects the star option with queries" do
@@ -43,7 +43,7 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search = Article.search('thin', :star => true)
     search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
 
-    search.first.excerpts.title.
-      should == '<span class="match">Something</span>'
+    expect(search.first.excerpts.title).
+      to eq('<span class="match">Something</span>')
   end
 end

data/spec/acceptance/facets_spec.rb

@@ -16,9 +16,9 @@ describe 'Faceted searching', :live => true do
     Tee.create! :colour => green
     index
 
-    Tee.facets.to_hash[:colour_id].should == {
+    expect(Tee.facets.to_hash[:colour_id]).to eq({
       blue.id => 2, red.id => 1, green.id => 3
-    }
+    })
   end
 
   it "provides facet breakdowns across classes" do
@@ -30,9 +30,9 @@ describe 'Faceted searching', :live => true do
 
     article_count = ENV['SPHINX_VERSION'].try(:[], /2.0.\d/) ? 2 : 1
 
-    ThinkingSphinx.facets.to_hash[:class].should == {
+    expect(ThinkingSphinx.facets.to_hash[:class]).to eq({
       'Tee' => 2, 'City' => 1, 'Article' => article_count
-    }
+    })
   end
 
   it "handles field facets" do
@@ -42,9 +42,9 @@ describe 'Faceted searching', :live => true do
     Book.create! :title => '1Q84',          :author => '村上 春樹'
     index
 
-    Book.facets.to_hash[:author].should == {
+    expect(Book.facets.to_hash[:author]).to eq({
       'Neil Gaiman' => 2, 'Terry Pratchett' => 1, '村上 春樹' => 1
-    }
+    })
   end
 
   it "handles MVA facets" do
@@ -62,9 +62,9 @@ describe 'Faceted searching', :live => true do
       :tag => pancakes
     index
 
-    User.facets.to_hash[:tag_ids].should == {
+    expect(User.facets.to_hash[:tag_ids]).to eq({
       pancakes.id => 2, waffles.id => 1
-    }
+    })
   end
 
   it "can filter on integer facet results" do
@@ -76,7 +76,7 @@ describe 'Faceted searching', :live => true do
     r1 = Tee.create! :colour => red
     index
 
-    Tee.facets.for(:colour_id => blue.id).to_a.should == [b1, b2]
+    expect(Tee.facets.for(:colour_id => blue.id).to_a).to eq([b1, b2])
   end
 
   it "can filter on MVA facet results" do
@@ -91,7 +91,7 @@ describe 'Faceted searching', :live => true do
     Tagging.create! :article => Article.create!(:user => u2), :tag => pancakes
     index
 
-    User.facets.for(:tag_ids => waffles.id).to_a.should == [u1]
+    expect(User.facets.for(:tag_ids => waffles.id).to_a).to eq([u1])
   end
 
   it "can filter on string facet results" do
@@ -100,7 +100,7 @@ describe 'Faceted searching', :live => true do
     snuff = Book.create! :title => 'Snuff', :author => 'Terry Pratchett'
     index
 
-    Book.facets.for(:author => 'Neil Gaiman').to_a.should == [gods, boys]
+    expect(Book.facets.for(:author => 'Neil Gaiman').to_a).to eq([gods, boys])
   end
 
   it "allows enumeration" do
@@ -119,8 +119,8 @@ describe 'Faceted searching', :live => true do
       [:class, {'Tee' => 3}]
     ]
     Tee.facets.each do |facet, hash|
-      facet.should == expectations[calls].first
-      hash.should == expectations[calls].last
+      expect(facet).to eq(expectations[calls].first)
+      expect(hash).to eq(expectations[calls].last)
 
       calls += 1
     end

data/spec/acceptance/geosearching_spec.rb

@@ -7,8 +7,8 @@ describe 'Searching by latitude and longitude', :live => true do
     bri = City.create :name => 'Brisbane',  :lat => -0.4794031, :lng => 2.670838
     index
 
-    City.search(:geo => [-0.616241, 2.602712], :order => 'geodist ASC').
-      to_a.should == [syd, mel, bri]
+    expect(City.search(:geo => [-0.616241, 2.602712], :order => 'geodist ASC').
+      to_a).to eq([syd, mel, bri])
   end
 
   it "filters by distance" do
@@ -17,10 +17,10 @@ describe 'Searching by latitude and longitude', :live => true do
     bri = City.create :name => 'Brisbane',  :lat => -0.4794031, :lng => 2.670838
     index
 
-    City.search(
+    expect(City.search(
       :geo  => [-0.616241, 2.602712],
       :with => {:geodist => 0.0..470_000.0}
-    ).to_a.should == [mel, syd]
+    ).to_a).to eq([mel, syd])
   end
 
   it "provides the distance for each search result" do
@@ -37,9 +37,9 @@ describe 'Searching by latitude and longitude', :live => true do
     end
 
     if ActiveRecord::Base.configurations['test']['adapter'][/postgres/]
-      cities.first.geodist.should == expected[:postgresql]
+      expect(cities.first.geodist).to eq(expected[:postgresql])
     else # mysql
-      cities.first.geodist.should == expected[:mysql]
+      expect(cities.first.geodist).to eq(expected[:mysql])
     end
   end
 
@@ -49,10 +49,10 @@ describe 'Searching by latitude and longitude', :live => true do
     bri = City.create :name => 'Brisbane',  :lat => -0.4794031, :lng => 2.670838
     index
 
-    City.search(
+    expect(City.search(
       :geo  => [-0.616241, 2.602712],
       :with => {:geodist => 0.0..470_000.0},
       :select => "*, geodist as custom_weight"
-    ).to_a.should == [mel, syd]
+    ).to_a).to eq([mel, syd])
   end
 end

data/spec/acceptance/grouping_by_attributes_spec.rb

@@ -8,7 +8,7 @@ describe 'Grouping search results by attributes', :live => true do
 
     index
 
-    Book.search(:group_by => :year).to_a.should == [snuff, earth]
+    expect(Book.search(:group_by => :year).to_a).to eq([snuff, earth])
   end
 
   it "allows sorting within the group" do
@@ -18,8 +18,8 @@ describe 'Grouping search results by attributes', :live => true do
 
     index
 
-    Book.search(:group_by => :year, :order_group_by => 'title ASC').to_a.
-      should == [snuff, dodger]
+    expect(Book.search(:group_by => :year, :order_group_by => 'title ASC').to_a).
+      to eq([snuff, dodger])
   end
 
   it "allows enumerating by count" do
@@ -34,8 +34,8 @@ describe 'Grouping search results by attributes', :live => true do
     Book.search(:group_by => :year).each_with_count do |book, count|
       expectation = expectations.shift
 
-      book.should  == expectation.first
-      count.should == expectation.last
+      expect(book).to  eq(expectation.first)
+      expect(count).to eq(expectation.last)
     end
   end
 
@@ -51,8 +51,8 @@ describe 'Grouping search results by attributes', :live => true do
     Book.search(:group_by => :year).each_with_group do |book, group|
       expectation = expectations.shift
 
-      book.should  == expectation.first
-      group.should == expectation.last
+      expect(book).to  eq(expectation.first)
+      expect(group).to eq(expectation.last)
     end
   end
 
@@ -69,9 +69,9 @@ describe 'Grouping search results by attributes', :live => true do
     search.each_with_group_and_count do |book, group, count|
       expectation = expectations.shift
 
-      book.should  == expectation[0]
-      group.should == expectation[1]
-      count.should == expectation[2]
+      expect(book).to  eq(expectation[0])
+      expect(group).to eq(expectation[1])
+      expect(count).to eq(expectation[2])
     end
   end
 end

data/spec/acceptance/index_options_spec.rb

@@ -14,11 +14,11 @@ describe 'Index options' do
       end
 
       it "keeps #{type}_fields blank" do
-        index.send("#{type}_fields").should be_nil
+        expect(index.send("#{type}_fields")).to be_nil
       end
 
       it "sets min_#{type}_len" do
-        index.send("min_#{type}_len").should == 3
+        expect(index.send("min_#{type}_len")).to eq(3)
       end
     end
 
@@ -33,11 +33,11 @@ describe 'Index options' do
       end
 
       it "#{type}_fields should contain the field" do
-        index.send("#{type}_fields").should == 'title'
+        expect(index.send("#{type}_fields")).to eq('title')
       end
 
       it "sets min_#{type}_len" do
-        index.send("min_#{type}_len").should == 3
+        expect(index.send("min_#{type}_len")).to eq(3)
       end
     end
   end
@@ -57,12 +57,12 @@ describe 'Index options' do
     end
 
     it "stores each source definition" do
-      index.sources.length.should == 2
+      expect(index.sources.length).to eq(2)
     end
 
     it "treats each source as separate" do
-      index.sources.first.fields.length.should == 2
-      index.sources.last.fields.length.should  == 3
+      expect(index.sources.first.fields.length).to eq(2)
+      expect(index.sources.last.fields.length).to  eq(3)
     end
   end
 
@@ -77,11 +77,11 @@ describe 'Index options' do
     end
 
     it "declares wordcount fields" do
-      index.sources.first.sql_field_str2wordcount.should == ['title']
+      expect(index.sources.first.sql_field_str2wordcount).to eq(['title'])
     end
 
     it "declares wordcount attributes" do
-      index.sources.first.sql_attr_str2wordcount.should == ['content']
+      expect(index.sources.first.sql_attr_str2wordcount).to eq(['content'])
     end
   end
 
@@ -98,15 +98,15 @@ describe 'Index options' do
     end
 
     it "allows for core source settings" do
-      index.sources.first.sql_range_step.should == 5
+      expect(index.sources.first.sql_range_step).to eq(5)
     end
 
     it "allows for source options" do
-      index.sources.first.disable_range?.should be_true
+      expect(index.sources.first.disable_range?).to be_truthy
     end
 
     it "respects sql_query_pre values" do
-      index.sources.first.sql_query_pre.should include("DO STUFF")
+      expect(index.sources.first.sql_query_pre).to include("DO STUFF")
     end
   end
 
@@ -130,23 +130,23 @@ describe 'Index options' do
     end
 
     it "prioritises index-level options over YAML options" do
-      index.min_infix_len.should == 1
+      expect(index.min_infix_len).to eq(1)
     end
 
     it "prioritises index-level source options" do
-      index.sources.first.sql_range_step.should == 20
+      expect(index.sources.first.sql_range_step).to eq(20)
     end
 
     it "keeps index-level options prioritised when rendered again" do
       index.render
 
-      index.min_infix_len.should == 1
+      expect(index.min_infix_len).to eq(1)
     end
 
     it "keeps index-level options prioritised when rendered again" do
       index.render
 
-      index.sources.first.sql_range_step.should == 20
+      expect(index.sources.first.sql_range_step).to eq(20)
     end
   end
 end

data/spec/acceptance/indexing_spec.rb

@@ -8,7 +8,7 @@ describe 'Indexing', :live => true do
 
     article = Article.create! :title => 'Pancakes'
     index 'article_core'
-    Article.search.should be_empty
+    expect(Article.search).to be_empty
 
     FileUtils.rm path
   end
@@ -20,7 +20,7 @@ describe 'Indexing', :live => true do
 
     article = Article.create! :title => 'Pancakes'
     index 'article_core'
-    Article.search.should_not be_empty
+    expect(Article.search).not_to be_empty
 
     FileUtils.rm path
   end
@@ -31,6 +31,6 @@ describe 'Indexing', :live => true do
     index 'article_core'
 
     file = Rails.root.join('db/sphinx/test/ts-article_core.tmp')
-    File.exist?(file).should be_false
+    expect(File.exist?(file)).to be_falsey
   end
 end

data/spec/acceptance/paginating_search_results_spec.rb

@@ -5,20 +5,20 @@ describe 'Paginating search results', :live => true do
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
-    Article.search.total_entries.should == 21
+    expect(Article.search.total_entries).to eq(21)
   end
 
   it "paginates the result set by default" do
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
-    Article.search.length.should == 20
+    expect(Article.search.length).to eq(20)
   end
 
   it "tracks the number of pages" do
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
-    Article.search.total_pages.should == 2
+    expect(Article.search.total_pages).to eq(2)
   end
 end

data/spec/acceptance/real_time_updates_spec.rb

@@ -4,14 +4,14 @@ describe 'Updates to records in real-time indices', :live => true do
   it "handles fields with unicode nulls" do
     product = Product.create! :name => "Widget \u0000"
 
-    Product.search.first.should == product
-  end
+    expect(Product.search.first).to eq(product)
+  end unless ENV['DATABASE'] == 'postgresql'
 
   it "handles attributes for sortable fields accordingly" do
     product = Product.create! :name => 'Red Fish'
     product.update_attributes :name => 'Blue Fish'
 
-    Product.search('blue fish', :indices => ['product_core']).to_a.
-      should == [product]
+    expect(Product.search('blue fish', :indices => ['product_core']).to_a).
+      to eq([product])
   end
 end

data/spec/acceptance/remove_deleted_records_spec.rb

@@ -5,47 +5,47 @@ describe 'Hiding deleted records from search results', :live => true do
     pancakes = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('pancakes').should_not be_empty
+    expect(Article.search('pancakes')).not_to be_empty
     pancakes.destroy
 
-    Article.search('pancakes').should be_empty
+    expect(Article.search('pancakes')).to be_empty
   end
 
   it "will catch stale records deleted without callbacks being fired" do
     pancakes = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('pancakes').should_not be_empty
+    expect(Article.search('pancakes')).not_to be_empty
     Article.connection.execute "DELETE FROM articles WHERE id = #{pancakes.id}"
 
-    Article.search('pancakes').should be_empty
+    expect(Article.search('pancakes')).to be_empty
   end
 
   it "removes records from real-time index results" do
     product = Product.create! :name => 'Shiny'
 
-    Product.search('Shiny', :indices => ['product_core']).to_a.
-      should == [product]
+    expect(Product.search('Shiny', :indices => ['product_core']).to_a).
+      to eq([product])
 
     product.destroy
 
-    Product.search_for_ids('Shiny', :indices => ['product_core']).
-      should be_empty
+    expect(Product.search_for_ids('Shiny', :indices => ['product_core'])).
+      to be_empty
   end
 
   it "does not remove real-time results when callbacks are disabled" do
     original = ThinkingSphinx::Configuration.instance.
       settings['real_time_callbacks']
     product = Product.create! :name => 'Shiny'
-    Product.search('Shiny', :indices => ['product_core']).to_a.
-      should == [product]
+    expect(Product.search('Shiny', :indices => ['product_core']).to_a).
+      to eq([product])
 
     ThinkingSphinx::Configuration.instance.
       settings['real_time_callbacks'] = false
 
     product.destroy
-    Product.search_for_ids('Shiny', :indices => ['product_core']).
-      should_not be_empty
+    expect(Product.search_for_ids('Shiny', :indices => ['product_core'])).
+      not_to be_empty
 
     ThinkingSphinx::Configuration.instance.
       settings['real_time_callbacks'] = original