thinking-sphinx 3.2.0 → 3.3.0

data/spec/acceptance/search_counts_spec.rb

@@ -5,7 +5,7 @@ describe 'Get search result counts', :live => true do
     4.times { |i| Article.create :title => "Article #{i}" }
     index
 
-    Article.search_count.should == 4
+    expect(Article.search_count).to eq(4)
   end
 
   it "returns counts across all models" do
@@ -13,6 +13,6 @@ describe 'Get search result counts', :live => true do
     2.times { |i| Book.create :title => "Book #{i}" }
     index
 
-    ThinkingSphinx.count.should == 5
+    expect(ThinkingSphinx.count).to eq(5)
   end
 end

data/spec/acceptance/search_for_just_ids_spec.rb

@@ -6,7 +6,7 @@ describe 'Searching for just instance Ids', :live => true do
     waffles  = Article.create! :title => 'Waffles'
     index
 
-    Article.search_for_ids('pancakes').to_a.should == [pancakes.id]
+    expect(Article.search_for_ids('pancakes').to_a).to eq([pancakes.id])
   end
 
   it "works across the global context" do
@@ -14,6 +14,6 @@ describe 'Searching for just instance Ids', :live => true do
     book    = Book.create! :title => 'American Gods'
     index
 
-    ThinkingSphinx.search_for_ids.to_a.should =~ [article.id, book.id]
+    expect(ThinkingSphinx.search_for_ids.to_a).to match_array([article.id, book.id])
   end
 end

data/spec/acceptance/searching_across_models_spec.rb

@@ -5,7 +5,7 @@ describe 'Searching across models', :live => true do
     article = Article.create! :title => 'Pancakes'
     index
 
-    ThinkingSphinx.search.first.should == article
+    expect(ThinkingSphinx.search.first).to eq(article)
   end
 
   it "returns results matching the given query" do
@@ -14,8 +14,8 @@ describe 'Searching across models', :live => true do
     index
 
     articles = ThinkingSphinx.search 'pancakes'
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "handles results from different models" do
@@ -23,7 +23,7 @@ describe 'Searching across models', :live => true do
     book    = Book.create! :title => 'American Gods'
     index
 
-    ThinkingSphinx.search.to_a.should =~ [article, book]
+    expect(ThinkingSphinx.search.to_a).to match_array([article, book])
   end
 
   it "filters by multiple classes" do
@@ -32,7 +32,7 @@ describe 'Searching across models', :live => true do
     user    = User.create! :name => 'Pat'
     index
 
-    ThinkingSphinx.search(:classes => [User, Article]).to_a.
-      should =~ [article, user]
+    expect(ThinkingSphinx.search(:classes => [User, Article]).to_a).
+      to match_array([article, user])
   end
 end

data/spec/acceptance/searching_across_schemas_spec.rb

@@ -16,23 +16,23 @@ describe 'Searching across PostgreSQL schemas', :live => true do
   it 'can distinguish between objects with the same primary key' do
     multi_schema.switch :public
     jekyll = Product.create name: 'Doctor Jekyll'
-    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
-    Product.search(:retry_stale => false).to_a.should == [jekyll]
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search(:retry_stale => false).to_a).to eq([jekyll])
 
     multi_schema.switch :thinking_sphinx
     hyde = Product.create name: 'Mister Hyde'
-    Product.search('Jekyll', :retry_stale => false).to_a.should == []
-    Product.search('Hyde', :retry_stale => false).to_a.should == [hyde]
-    Product.search(:retry_stale => false).to_a.should == [hyde]
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([])
+    expect(Product.search('Hyde', :retry_stale => false).to_a).to eq([hyde])
+    expect(Product.search(:retry_stale => false).to_a).to eq([hyde])
 
     multi_schema.switch :public
-    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
-    Product.search(:retry_stale => false).to_a.should == [jekyll]
-    Product.search('Hyde', :retry_stale => false).to_a.should == []
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search(:retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search('Hyde', :retry_stale => false).to_a).to eq([])
 
-    Product.search(
+    expect(Product.search(
       :middleware => ThinkingSphinx::Middlewares::RAW_ONLY,
       :indices    => ['product_core', 'product_two_core']
-    ).to_a.length.should == 2
+    ).to_a.length).to eq(2)
   end
 end if multi_schema.active?

data/spec/acceptance/searching_on_fields_spec.rb

@@ -8,8 +8,8 @@ describe 'Searching on fields', :live => true do
     index
 
     articles = Article.search :conditions => {:title => 'pancakes'}
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "limits results for a field from an association" do
@@ -17,7 +17,7 @@ describe 'Searching on fields', :live => true do
     pancakes = Article.create! :title => 'Pancakes', :user => user
     index
 
-    Article.search(:conditions => {:user => 'pat'}).first.should == pancakes
+    expect(Article.search(:conditions => {:user => 'pat'}).first).to eq(pancakes)
   end
 
   it "returns results with matches from grouped fields" do
@@ -26,23 +26,23 @@ describe 'Searching on fields', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :user => user
     index
 
-    Article.search('waffles', :conditions => {:title => 'pancakes'}).to_a.
-      should == [pancakes]
+    expect(Article.search('waffles', :conditions => {:title => 'pancakes'}).to_a).
+      to eq([pancakes])
   end
 
   it "returns results with matches from concatenated columns in a field" do
     book = Book.create! :title => 'Night Watch', :author => 'Terry Pratchett'
     index
 
-    Book.search(:conditions => {:info => 'Night Pratchett'}).to_a.
-      should == [book]
+    expect(Book.search(:conditions => {:info => 'Night Pratchett'}).to_a).
+      to eq([book])
   end
 
   it "handles NULLs in concatenated fields" do
     book = Book.create! :title => 'Night Watch'
     index
 
-    Book.search(:conditions => {:info => 'Night Watch'}).to_a.should == [book]
+    expect(Book.search(:conditions => {:info => 'Night Watch'}).to_a).to eq([book])
   end
 
   it "returns results with matches from file fields" do
@@ -52,6 +52,6 @@ describe 'Searching on fields', :live => true do
     book = Book.create! :title => 'Accelerando', :blurb_file => file_path.to_s
     index
 
-    Book.search('cyberpunk').to_a.should == [book]
+    expect(Book.search('cyberpunk').to_a).to eq([book])
   end
 end

data/spec/acceptance/searching_with_filters_spec.rb

@@ -6,7 +6,7 @@ describe 'Searching with filters', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :published => false
     index
 
-    Article.search(:with => {:published => true}).to_a.should == [pancakes]
+    expect(Article.search(:with => {:published => true}).to_a).to eq([pancakes])
   end
 
   it "limits results by an array of values" do
@@ -15,7 +15,7 @@ describe 'Searching with filters', :live => true do
     grave = Book.create! :title => 'The Graveyard Book', :year => 2009
     index
 
-    Book.search(:with => {:year => [2001, 2005]}).to_a.should == [gods, boys]
+    expect(Book.search(:with => {:year => [2001, 2005]}).to_a).to eq([gods, boys])
   end
 
   it "limits results by a ranged filter" do
@@ -28,8 +28,8 @@ describe 'Searching with filters', :live => true do
     grave.update_column :created_at, 1.day.ago
     index
 
-    Book.search(:with => {:created_at => 6.days.ago..2.days.ago}).to_a.
-      should == [gods, boys]
+    expect(Book.search(:with => {:created_at => 6.days.ago..2.days.ago}).to_a).
+      to eq([gods, boys])
   end
 
   it "limits results by exclusive filters on single values" do
@@ -37,7 +37,7 @@ describe 'Searching with filters', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :published => false
     index
 
-    Article.search(:without => {:published => true}).to_a.should == [waffles]
+    expect(Article.search(:without => {:published => true}).to_a).to eq([waffles])
   end
 
   it "limits results by exclusive filters on arrays of values" do
@@ -46,7 +46,7 @@ describe 'Searching with filters', :live => true do
     grave = Book.create! :title => 'The Graveyard Book', :year => 2009
     index
 
-    Book.search(:without => {:year => [2001, 2005]}).to_a.should == [grave]
+    expect(Book.search(:without => {:year => [2001, 2005]}).to_a).to eq([grave])
   end
 
   it "limits results by ranged filters on timestamp MVAs" do
@@ -64,9 +64,9 @@ describe 'Searching with filters', :live => true do
 
     index
 
-    Article.search(
+    expect(Article.search(
       :with => {:taggings_at => 1.days.ago..1.day.from_now}
-    ).to_a.should == [pancakes]
+    ).to_a).to eq([pancakes])
   end
 
   it "takes into account local timezones for timestamps" do
@@ -84,9 +84,9 @@ describe 'Searching with filters', :live => true do
 
     index
 
-    Article.search(
+    expect(Article.search(
       :with => {:taggings_at => 2.minutes.ago..Time.zone.now}
-    ).to_a.should == [pancakes]
+    ).to_a).to eq([pancakes])
   end
 
   it "limits results with MVAs having all of the given values" do
@@ -103,13 +103,13 @@ describe 'Searching with filters', :live => true do
     index
 
     articles = Article.search :with_all => {:tag_ids => [food.id, flat.id]}
-    articles.to_a.should == [pancakes]
+    expect(articles.to_a).to eq([pancakes])
   end
 
   it "limits results with MVAs that don't contain all the given values" do
     # Matching results may have some of the given values, but cannot have all
     # of them. Certainly an edge case.
-    pending "SphinxQL doesn't yet support OR in its WHERE clause"
+    skip "SphinxQL doesn't yet support OR in its WHERE clause"
 
     pancakes = Article.create :title => 'Pancakes'
     waffles  = Article.create :title => 'Waffles'
@@ -124,7 +124,7 @@ describe 'Searching with filters', :live => true do
     index
 
     articles = Article.search :without_all => {:tag_ids => [food.id, flat.id]}
-    articles.to_a.should == [waffles]
+    expect(articles.to_a).to eq([waffles])
   end
 
   it "limits results on real-time indices with multi-value integer attributes" do
@@ -139,7 +139,7 @@ describe 'Searching with filters', :live => true do
     waffles.categories  << food
 
     products = Product.search :with => {:category_ids => [flat.id]}
-    products.to_a.should == [pancakes]
+    expect(products.to_a).to eq([pancakes])
   end
 
   it 'searches with real-time JSON attributes' do
@@ -149,9 +149,9 @@ describe 'Searching with filters', :live => true do
       :options => {'chocolate' => 1, 'sugar' => 1, :number => 1}
 
     products = Product.search :with => {"options.lemon" => 1}
-    products.to_a.should == [pancakes]
+    expect(products.to_a).to eq([pancakes])
 
     products = Product.search :with => {"options.sugar" => 1}
-    products.to_a.should == [pancakes, waffles]
+    expect(products.to_a).to eq([pancakes, waffles])
   end if JSONColumn.call
 end

data/spec/acceptance/searching_with_sti_spec.rb

@@ -6,7 +6,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Animal.search(:indices  => ['animal_core']).to_a.should == [platypus, duck]
+    expect(Animal.search(:indices  => ['animal_core']).to_a).to eq([platypus, duck])
   end
 
   it "limits results based on subclasses" do
@@ -14,7 +14,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck])
   end
 
   it "returns results for deeper subclasses when searching on their parents" do
@@ -23,7 +23,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck, emu]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck, emu])
   end
 
   it "returns results for deeper subclasses" do
@@ -32,7 +32,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    FlightlessBird.search(:indices  => ['animal_core']).to_a.should == [emu]
+    expect(FlightlessBird.search(:indices  => ['animal_core']).to_a).to eq([emu])
   end
 
   it "filters out sibling subclasses" do
@@ -41,7 +41,7 @@ describe 'Searching across STI models', :live => true do
     otter    = Mammal.create :name => 'Otter'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck])
   end
 
   it "obeys :classes if supplied" do
@@ -50,18 +50,18 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(
+    expect(Bird.search(
       :indices  => ['animal_core'],
       :skip_sti => true,
       :classes  => [Bird, FlightlessBird]
-    ).to_a.should == [duck, emu]
+    ).to_a).to eq([duck, emu])
   end
 
   it 'finds root objects when type is blank' do
     animal = Animal.create :name => 'Animal', type: ''
     index
 
-    Animal.search(:indices => ['animal_core']).to_a.should == [animal]
+    expect(Animal.search(:indices => ['animal_core']).to_a).to eq([animal])
   end
 
   it 'allows for indices on mid-hierarchy classes' do
@@ -69,6 +69,6 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(:indices => ['bird_core']).to_a.should == [duck, emu]
+    expect(Bird.search(:indices => ['bird_core']).to_a).to eq([duck, emu])
   end
 end

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -6,7 +6,7 @@ describe 'Searching within a model', :live => true do
     article = Article.create! :title => 'Pancakes'
     index
 
-    Article.search.first.should == article
+    expect(Article.search.first).to eq(article)
   end
 
   it "returns results matching the given query" do
@@ -15,22 +15,22 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search 'pancakes'
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "handles unicode characters" do
     istanbul = City.create! :name => 'İstanbul'
     index
 
-    City.search('İstanbul').to_a.should == [istanbul]
+    expect(City.search('İstanbul').to_a).to eq([istanbul])
   end
 
   it "will star provided queries on request" do
     article = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('cake', :star => true).first.should == article
+    expect(Article.search('cake', :star => true).first).to eq(article)
   end
 
   it "allows for searching on specific indices" do
@@ -38,7 +38,7 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search('pancake', :indices => ['stemmed_article_core'])
-    articles.to_a.should == [article]
+    expect(articles.to_a).to eq([article])
   end
 
   it "allows for searching on distributed indices" do
@@ -46,38 +46,38 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search('pancake', :indices => ['article'])
-    articles.to_a.should == [article]
+    expect(articles.to_a).to eq([article])
   end
 
   it "can search on namespaced models" do
     person = Admin::Person.create :name => 'James Bond'
     index
 
-    Admin::Person.search('Bond').to_a.should == [person]
+    expect(Admin::Person.search('Bond').to_a).to eq([person])
   end
 
   it "raises an error if searching through an ActiveRecord scope" do
-    lambda {
+    expect {
       City.ordered.search
-    }.should raise_error(ThinkingSphinx::MixedScopesError)
+    }.to raise_error(ThinkingSphinx::MixedScopesError)
   end
 
   it "does not raise an error when searching with a default ActiveRecord scope" do
-    lambda {
+    expect {
       User.search
-    }.should_not raise_error(ThinkingSphinx::MixedScopesError)
+    }.not_to raise_error
   end
 
   it "raises an error when searching with default and applied AR scopes" do
-    lambda {
+    expect {
       User.recent.search
-    }.should raise_error(ThinkingSphinx::MixedScopesError)
+    }.to raise_error(ThinkingSphinx::MixedScopesError)
   end
 
   it "raises an error if the model has no indices defined" do
-    lambda {
+    expect {
       Category.search.to_a
-    }.should raise_error(ThinkingSphinx::NoIndicesError)
+    }.to raise_error(ThinkingSphinx::NoIndicesError)
   end
 end
 
@@ -85,6 +85,6 @@ describe 'Searching within a model with a realtime index', :live => true do
   it "returns results" do
     product = Product.create! :name => 'Widget'
 
-    Product.search.first.should == product
+    expect(Product.search.first).to eq(product)
   end
 end