thinking-sphinx 3.2.0 → 3.3.0

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -37,7 +37,7 @@ describe ThinkingSphinx::FacetSearch do
 
   describe '#[]' do
     it "populates facet results" do
-      facet_search[:price_bracket].should == {3 => 5}
+      expect(facet_search[:price_bracket]).to eq({3 => 5})
     end
   end
 
@@ -45,17 +45,17 @@ describe ThinkingSphinx::FacetSearch do
     it "queries on each facet with a grouped search in a batch" do
       facet_search.populate
 
-      batch.searches.detect { |search|
+      expect(batch.searches.detect { |search|
         search.options[:group_by] == 'price_bracket'
-      }.should_not be_nil
+      }).not_to be_nil
     end
 
     it "limits query for a facet to just indices that have that facet" do
       facet_search.populate
 
-      batch.searches.detect { |search|
+      expect(batch.searches.detect { |search|
         search.options[:indices] == ['foo_core']
-      }.should_not be_nil
+      }).not_to be_nil
     end
 
     it "limits facets to the specified set" do
@@ -63,25 +63,25 @@ describe ThinkingSphinx::FacetSearch do
 
       facet_search.populate
 
-      batch.searches.collect { |search|
+      expect(batch.searches.collect { |search|
         search.options[:group_by]
-      }.should == ['category_id']
+      }).to eq(['category_id'])
     end
 
     it "aliases the class facet from sphinx_internal_class" do
-      property_a.stub :name => 'sphinx_internal_class'
+      allow(property_a).to receive_messages :name => 'sphinx_internal_class'
 
       facet_search.populate
 
-      facet_search[:class].should == {'Foo' => 5}
+      expect(facet_search[:class]).to eq({'Foo' => 5})
     end
 
     it "uses the @groupby value for MVAs" do
-      property_a.stub :name => 'tag_ids', :multi? => true
+      allow(property_a).to receive_messages :name => 'tag_ids', :multi? => true
 
       facet_search.populate
 
-      facet_search[:tag_ids].should == {2 => 5}
+      expect(facet_search[:tag_ids]).to eq({2 => 5})
     end
 
     [:max_matches, :limit].each do |setting|
@@ -89,7 +89,7 @@ describe ThinkingSphinx::FacetSearch do
         facet_search.populate
 
         batch.searches.each { |search|
-          search.options[setting].should == 1000
+          expect(search.options[setting]).to eq(1000)
         }
       end
 
@@ -99,7 +99,7 @@ describe ThinkingSphinx::FacetSearch do
         facet_search.populate
 
         batch.searches.each { |search|
-          search.options[setting].should == 1234
+          expect(search.options[setting]).to eq(1234)
         }
       end
     end
@@ -111,7 +111,7 @@ describe ThinkingSphinx::FacetSearch do
         facet_search.populate
 
         batch.searches.each { |search|
-          search.options[setting].should == 42
+          expect(search.options[setting]).to eq(42)
         }
       end
 
@@ -122,8 +122,8 @@ describe ThinkingSphinx::FacetSearch do
         facet_search.populate
 
         batch.searches.each do |search|
-          search.options[setting].should == 10
-          search.options[:max_matches].should == 500
+          expect(search.options[setting]).to eq(10)
+          expect(search.options[:max_matches]).to eq(500)
         end
       end
     end

data/spec/thinking_sphinx/index_set_spec.rb

@@ -17,13 +17,13 @@ describe ThinkingSphinx::IndexSet do
 
   def class_double(name, *superclasses)
     klass = double 'class', :name => name, :class => Class
-    klass.stub :ancestors => ([klass] + superclasses + [ar_base])
+    allow(klass).to receive_messages :ancestors => ([klass] + superclasses + [ar_base])
     klass
   end
 
   describe '#to_a' do
     it "ensures the indices are loaded" do
-      configuration.should_receive(:preload_indices)
+      expect(configuration).to receive(:preload_indices)
 
       set.to_a
     end
@@ -37,7 +37,7 @@ describe ThinkingSphinx::IndexSet do
 
       configuration.indices.replace [article_core, user_core, distributed]
 
-      set.to_a.should == [article_core, user_core]
+      expect(set.to_a).to eq([article_core, user_core])
     end
 
     it "uses indices for the given classes" do
@@ -49,7 +49,7 @@ describe ThinkingSphinx::IndexSet do
 
       options[:classes] = [class_double('Article')]
 
-      set.to_a.length.should == 1
+      expect(set.to_a.length).to eq(1)
     end
 
     it "requests indices for any superclasses" do
@@ -63,7 +63,7 @@ describe ThinkingSphinx::IndexSet do
         class_double('OpinionArticle', class_double('Article'))
       ]
 
-      set.to_a.length.should == 2
+      expect(set.to_a.length).to eq(2)
     end
 
     it "uses named indices if names are provided" do
@@ -73,7 +73,7 @@ describe ThinkingSphinx::IndexSet do
 
       options[:indices] = ['article_core']
 
-      set.to_a.should == [article_core]
+      expect(set.to_a).to eq([article_core])
     end
 
     it "selects from the full index set those with matching references" do
@@ -85,7 +85,7 @@ describe ThinkingSphinx::IndexSet do
 
       options[:references] = [:book, :article]
 
-      set.to_a.length.should == 2
+      expect(set.to_a.length).to eq(2)
     end
   end
 end

data/spec/thinking_sphinx/index_spec.rb

@@ -4,7 +4,7 @@ describe ThinkingSphinx::Index do
   let(:configuration)  { Struct.new(:indices, :settings).new([], {}) }
   
   before :each do
-    ThinkingSphinx::Configuration.stub :instance => configuration
+    allow(ThinkingSphinx::Configuration).to receive_messages :instance => configuration
   end
   
   describe '.define' do
@@ -12,29 +12,29 @@ describe ThinkingSphinx::Index do
     
     context 'with ActiveRecord' do
       before :each do
-        ThinkingSphinx::ActiveRecord::Index.stub :new => index
+        allow(ThinkingSphinx::ActiveRecord::Index).to receive_messages :new => index
       end
 
       it "creates an ActiveRecord index" do
-        ThinkingSphinx::ActiveRecord::Index.should_receive(:new).
+        expect(ThinkingSphinx::ActiveRecord::Index).to receive(:new).
           with(:user, :with => :active_record).and_return index
 
         ThinkingSphinx::Index.define(:user, :with => :active_record)
       end
 
       it "returns the ActiveRecord index" do
-        ThinkingSphinx::Index.define(:user, :with => :active_record).
-          should == [index]
+        expect(ThinkingSphinx::Index.define(:user, :with => :active_record)).
+          to eq([index])
       end
 
       it "adds the index to the collection of indices" do
         ThinkingSphinx::Index.define(:user, :with => :active_record)
 
-        configuration.indices.should include(index)
+        expect(configuration.indices).to include(index)
       end
 
       it "sets the block in the index" do
-        index.should_receive(:definition_block=).with instance_of(Proc)
+        expect(index).to receive(:definition_block=).with instance_of(Proc)
 
         ThinkingSphinx::Index.define(:user, :with => :active_record) do
           indexes name
@@ -46,19 +46,19 @@ describe ThinkingSphinx::Index do
         let(:processor)   { double('delta processor') }
 
         before :each do
-          ThinkingSphinx::Deltas.stub :processor_for => processor
-          ThinkingSphinx::ActiveRecord::Index.stub(:new).
+          allow(ThinkingSphinx::Deltas).to receive_messages :processor_for => processor
+          allow(ThinkingSphinx::ActiveRecord::Index).to receive(:new).
             and_return(index, delta_index)
         end
 
         it "creates two indices with delta settings" do
-          ThinkingSphinx::ActiveRecord::Index.unstub :new
-          ThinkingSphinx::ActiveRecord::Index.should_receive(:new).
+          allow(ThinkingSphinx::ActiveRecord::Index).to receive(:new).and_call_original
+          expect(ThinkingSphinx::ActiveRecord::Index).to receive(:new).
             with(:user,
               hash_including(:delta? => false, :delta_processor => processor)
             ).once.
             and_return index
-          ThinkingSphinx::ActiveRecord::Index.should_receive(:new).
+          expect(ThinkingSphinx::ActiveRecord::Index).to receive(:new).
             with(:user,
               hash_including(:delta? => true,  :delta_processor => processor)
             ).once.
@@ -74,13 +74,13 @@ describe ThinkingSphinx::Index do
             :with  => :active_record,
             :delta => true
 
-          configuration.indices.should include(index)
-          configuration.indices.should include(delta_index)
+          expect(configuration.indices).to include(index)
+          expect(configuration.indices).to include(delta_index)
         end
 
         it "sets the block in the index" do
-          index.should_receive(:definition_block=).with instance_of(Proc)
-          delta_index.should_receive(:definition_block=).with instance_of(Proc)
+          expect(index).to receive(:definition_block=).with instance_of(Proc)
+          expect(delta_index).to receive(:definition_block=).with instance_of(Proc)
 
           ThinkingSphinx::Index.define(:user,
             :with  => :active_record,
@@ -93,29 +93,29 @@ describe ThinkingSphinx::Index do
 
     context 'with Real-Time' do
       before :each do
-        ThinkingSphinx::RealTime::Index.stub :new => index
+        allow(ThinkingSphinx::RealTime::Index).to receive_messages :new => index
       end
 
       it "creates a real-time index" do
-        ThinkingSphinx::RealTime::Index.should_receive(:new).
+        expect(ThinkingSphinx::RealTime::Index).to receive(:new).
           with(:user, :with => :real_time).and_return index
 
         ThinkingSphinx::Index.define(:user, :with => :real_time)
       end
 
       it "returns the ActiveRecord index" do
-        ThinkingSphinx::Index.define(:user, :with => :real_time).
-          should == [index]
+        expect(ThinkingSphinx::Index.define(:user, :with => :real_time)).
+          to eq([index])
       end
 
       it "adds the index to the collection of indices" do
         ThinkingSphinx::Index.define(:user, :with => :real_time)
 
-        configuration.indices.should include(index)
+        expect(configuration.indices).to include(index)
       end
 
       it "sets the block in the index" do
-        index.should_receive(:definition_block=).with instance_of(Proc)
+        expect(index).to receive(:definition_block=).with instance_of(Proc)
 
         ThinkingSphinx::Index.define(:user, :with => :real_time) do
           indexes name
@@ -126,13 +126,13 @@ describe ThinkingSphinx::Index do
   
   describe '#initialize' do
     it "is fine with no defaults from settings" do
-      ThinkingSphinx::Index.new(:user, {}).options.should == {}
+      expect(ThinkingSphinx::Index.new(:user, {}).options).to eq({})
     end
     
     it "respects defaults from settings" do
       configuration.settings['index_options'] = {'delta' => true}
       
-      ThinkingSphinx::Index.new(:user, {}).options.should == {:delta => true}
+      expect(ThinkingSphinx::Index.new(:user, {}).options).to eq({:delta => true})
     end
   end
 end

data/spec/thinking_sphinx/masks/pagination_mask_spec.rb

@@ -12,13 +12,13 @@ describe ThinkingSphinx::Masks::PaginationMask do
 
   describe '#first_page?' do
     it "returns true when on the first page" do
-      mask.should be_first_page
+      expect(mask).to be_first_page
     end
 
     it "returns false on other pages" do
-      search.stub :current_page => 2
+      allow(search).to receive_messages :current_page => 2
 
-      mask.should_not be_first_page
+      expect(mask).not_to be_first_page
     end
   end
 
@@ -28,13 +28,13 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "is true when there's no more pages" do
-      search.stub :current_page => 3
+      allow(search).to receive_messages :current_page => 3
 
-      mask.should be_last_page
+      expect(mask).to be_last_page
     end
 
     it "is false when there's still more pages" do
-      mask.should_not be_last_page
+      expect(mask).not_to be_last_page
     end
   end
 
@@ -44,13 +44,13 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "should return one more than the current page" do
-      mask.next_page.should == 2
+      expect(mask.next_page).to eq(2)
     end
 
     it "should return nil if on the last page" do
-      search.stub :current_page => 3
+      allow(search).to receive_messages :current_page => 3
 
-      mask.next_page.should be_nil
+      expect(mask.next_page).to be_nil
     end
   end
 
@@ -60,13 +60,13 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "is true when there is a second page" do
-      mask.next_page?.should be_true
+      expect(mask.next_page?).to be_truthy
     end
 
     it "is false when there's no more pages" do
-      search.stub :current_page => 3
+      allow(search).to receive_messages :current_page => 3
 
-      mask.next_page?.should be_false
+      expect(mask.next_page?).to be_falsey
     end
   end
 
@@ -76,13 +76,13 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "should return one less than the current page" do
-      search.stub :current_page => 2
+      allow(search).to receive_messages :current_page => 2
 
-      mask.previous_page.should == 1
+      expect(mask.previous_page).to eq(1)
     end
 
     it "should return nil if on the first page" do
-      mask.previous_page.should be_nil
+      expect(mask.previous_page).to be_nil
     end
   end
 
@@ -92,7 +92,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "returns the total found from the search request metadata" do
-      mask.total_entries.should == 12
+      expect(mask.total_entries).to eq(12)
     end
   end
 
@@ -103,19 +103,19 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "uses the total available from the search request metadata" do
-      mask.total_pages.should == 2
+      expect(mask.total_pages).to eq(2)
     end
 
     it "should allow for custom per_page values" do
-      search.stub :per_page => 40
+      allow(search).to receive_messages :per_page => 40
 
-      mask.total_pages.should == 1
+      expect(mask.total_pages).to eq(1)
     end
 
     it "should return 0 if there is no index and therefore no results" do
       search.meta.clear
 
-      mask.total_pages.should == 0
+      expect(mask.total_pages).to eq(0)
     end
   end
 end

data/spec/thinking_sphinx/masks/scopes_mask_spec.rb

@@ -10,18 +10,18 @@ describe ThinkingSphinx::Masks::ScopesMask do
   let(:mask)   { ThinkingSphinx::Masks::ScopesMask.new search }
 
   before :each do
-    FileUtils.stub :mkdir_p => true
+    allow(FileUtils).to receive_messages :mkdir_p => true
   end
 
   describe '#search' do
     it "replaces the query if one is supplied" do
-      search.should_receive(:query=).with('bar')
+      expect(search).to receive(:query=).with('bar')
 
       mask.search('bar')
     end
 
     it "keeps the existing query when only options are offered" do
-      search.should_not_receive(:query=)
+      expect(search).not_to receive(:query=)
 
       mask.search :with => {:foo => :bar}
     end
@@ -31,7 +31,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search :conditions => {:baz => 'qux'}
 
-      search.options[:conditions].should == {:foo => 'bar', :baz => 'qux'}
+      expect(search.options[:conditions]).to eq({:foo => 'bar', :baz => 'qux'})
     end
 
     it "merges filters" do
@@ -39,7 +39,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search :with => {:baz => :qux}
 
-      search.options[:with].should == {:foo => :bar, :baz => :qux}
+      expect(search.options[:with]).to eq({:foo => :bar, :baz => :qux})
     end
 
     it "merges exclusive filters" do
@@ -47,7 +47,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search :without => {:baz => :qux}
 
-      search.options[:without].should == {:foo => :bar, :baz => :qux}
+      expect(search.options[:without]).to eq({:foo => :bar, :baz => :qux})
     end
 
     it "appends excluded ids" do
@@ -55,7 +55,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search :without_ids => [5, 7]
 
-      search.options[:without_ids].should == [1, 3, 5, 7]
+      expect(search.options[:without_ids]).to eq([1, 3, 5, 7])
     end
 
     it "replaces the retry_stale option" do
@@ -63,23 +63,23 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search :retry_stale => 6
 
-      search.options[:retry_stale].should == 6
+      expect(search.options[:retry_stale]).to eq(6)
     end
 
     it "returns the original search object" do
-      mask.search.object_id.should == search.object_id
+      expect(mask.search.object_id).to eq(search.object_id)
     end
   end
 
   describe '#search_for_ids' do
     it "replaces the query if one is supplied" do
-      search.should_receive(:query=).with('bar')
+      expect(search).to receive(:query=).with('bar')
 
       mask.search_for_ids('bar')
     end
 
     it "keeps the existing query when only options are offered" do
-      search.should_not_receive(:query=)
+      expect(search).not_to receive(:query=)
 
       mask.search_for_ids :with => {:foo => :bar}
     end
@@ -89,7 +89,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search_for_ids :conditions => {:baz => 'qux'}
 
-      search.options[:conditions].should == {:foo => 'bar', :baz => 'qux'}
+      expect(search.options[:conditions]).to eq({:foo => 'bar', :baz => 'qux'})
     end
 
     it "merges filters" do
@@ -97,7 +97,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search_for_ids :with => {:baz => :qux}
 
-      search.options[:with].should == {:foo => :bar, :baz => :qux}
+      expect(search.options[:with]).to eq({:foo => :bar, :baz => :qux})
     end
 
     it "merges exclusive filters" do
@@ -105,7 +105,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search_for_ids :without => {:baz => :qux}
 
-      search.options[:without].should == {:foo => :bar, :baz => :qux}
+      expect(search.options[:without]).to eq({:foo => :bar, :baz => :qux})
     end
 
     it "appends excluded ids" do
@@ -113,7 +113,7 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search_for_ids :without_ids => [5, 7]
 
-      search.options[:without_ids].should == [1, 3, 5, 7]
+      expect(search.options[:without_ids]).to eq([1, 3, 5, 7])
     end
 
     it "replaces the retry_stale option" do
@@ -121,17 +121,17 @@ describe ThinkingSphinx::Masks::ScopesMask do
 
       mask.search_for_ids :retry_stale => 6
 
-      search.options[:retry_stale].should == 6
+      expect(search.options[:retry_stale]).to eq(6)
     end
 
     it "adds the ids_only option" do
       mask.search_for_ids
 
-      search.options[:ids_only].should be_true
+      expect(search.options[:ids_only]).to be_truthy
     end
 
     it "returns the original search object" do
-      mask.search_for_ids.object_id.should == search.object_id
+      expect(mask.search_for_ids.object_id).to eq(search.object_id)
     end
   end
 end