sunspot_rails 2.2.7 → 2.2.8

data/spec/model_lifecycle_spec.rb

@@ -8,7 +8,7 @@ describe 'searchable with lifecycle' do
     end
 
     it 'should automatically index' do
-      PostWithAuto.search.results.should == [@post]
+      expect(PostWithAuto.search.results).to eq([@post])
     end
   end
 
@@ -20,20 +20,20 @@ describe 'searchable with lifecycle' do
     end
 
     it 'should automatically update index' do
-      PostWithAuto.search { with :title, 'Test 1' }.results.should == [@post]
+      expect(PostWithAuto.search { with :title, 'Test 1' }.results).to eq([@post])
     end
 
     it "should index model if relevant attribute changed" do
       @post = PostWithAuto.create!
       @post.title = 'new title'
-      @post.should_receive :solr_index
+      expect(@post).to receive :solr_index
       @post.save!
     end
 
     it "should not index model if relevant attribute not changed" do
       @post = PostWithAuto.create!
       @post.updated_at = Date.tomorrow
-      @post.should_not_receive :solr_index
+      expect(@post).not_to receive :solr_index
       @post.save!
     end
   end
@@ -46,7 +46,7 @@ describe 'searchable with lifecycle' do
     end
 
     it 'should automatically remove it from the index' do
-      PostWithAuto.search_ids.should be_empty
+      expect(PostWithAuto.search_ids).to be_empty
     end
   end
 
@@ -56,7 +56,7 @@ describe 'searchable with lifecycle' do
     end
 
     it "should not reindex the object on an update_at change, because it is marked as to-ignore" do
-      Sunspot.should_not_receive(:index).with(@post)
+      expect(Sunspot).not_to receive(:index).with(@post)
       @post.update_attribute :updated_at, 123.seconds.from_now
     end
   end
@@ -67,12 +67,12 @@ describe 'searchable with lifecycle' do
     end
 
     it "should not reindex the object on an update_at change, because it is not in the whitelist" do
-      Sunspot.should_not_receive(:index).with(@post)
+      expect(Sunspot).not_to receive(:index).with(@post)
       @post.update_attribute :updated_at, 123.seconds.from_now
     end
 
     it "should reindex the object on a title change, because it is in the whitelist" do
-      Sunspot.should_receive(:index).with(@post)
+      expect(Sunspot).to receive(:index).with(@post)
       @post.update_attribute :title, "brand new title"
     end
 

data/spec/model_spec.rb

@@ -8,17 +8,17 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should not commit the model' do
-      Post.search.results.should be_empty
+      expect(Post.search.results).to be_empty
     end
 
     it 'should index the model' do
       Sunspot.commit
-      Post.search.results.should == [@post]
+      expect(Post.search.results).to eq([@post])
     end
 
     it "should not blow up if there's a default scope specifying order" do
       posts = Array.new(2) { |j| PostWithDefaultScope.create! :title => (10-j).to_s }
-      lambda { PostWithDefaultScope.index(:batch_size => 1) }.should_not raise_error
+      expect { PostWithDefaultScope.index(:batch_size => 1) }.not_to raise_error
     end
   end
 
@@ -29,7 +29,7 @@ describe 'ActiveRecord mixin' do
 
     it 'should not break auto-indexing' do
       @post.title = 'Title'
-      lambda { @post.save! }.should_not raise_error
+      expect { @post.save! }.not_to raise_error
     end
   end
 
@@ -40,7 +40,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should immediately index and commit' do
-      Post.search.results.should == [@post]
+      expect(Post.search.results).to eq([@post])
     end
   end
 
@@ -52,12 +52,12 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should not commit immediately' do
-      Post.search.results.should == [@post]
+      expect(Post.search.results).to eq([@post])
     end
 
     it 'should remove the model from the index' do
       Sunspot.commit
-      Post.search.results.should be_empty
+      expect(Post.search.results).to be_empty
     end
   end
 
@@ -69,7 +69,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should immediately remove the model and commit' do
-      Post.search.results.should be_empty
+      expect(Post.search.results).to be_empty
     end
   end
 
@@ -81,12 +81,12 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should not commit immediately' do
-      Post.search.results.to_set.should == @posts.to_set
+      expect(Post.search.results.to_set).to eq(@posts.to_set)
     end
 
     it 'should remove all instances from the index' do
       Sunspot.commit
-      Post.search.results.should be_empty
+      expect(Post.search.results).to be_empty
     end
   end
 
@@ -98,7 +98,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should remove all instances from the index and commit immediately' do
-      Post.search.results.should be_empty
+      expect(Post.search.results).to be_empty
     end
   end
 
@@ -109,25 +109,25 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should return results specified by search' do
-      Post.search do
+      expect(Post.search do
         with :title, 'Test Post'
-      end.results.should == [@post]
+      end.results).to eq([@post])
     end
 
     it 'should not return results excluded by search' do
-      Post.search do
+      expect(Post.search do
         with :title, 'Bogus Post'
-      end.results.should be_empty
+      end.results).to be_empty
     end
 
     it 'should not allow bogus options to search' do
-      lambda { Post.search(:bogus => :option) }.should raise_error(ArgumentError)
+      expect { Post.search(:bogus => :option) }.to raise_error(ArgumentError)
     end
 
     it 'should pass :include option from search call to data accessor' do
-      Post.search(:include => [:location]) do
+      expect(Post.search(:include => [:location]) do
         with :title, 'Test Post'
-      end.data_accessor_for(Post).include.should == [:location]
+      end.data_accessor_for(Post).include).to eq([:location])
     end
     
     it 'should use the include option on the data accessor when specified' do
@@ -137,38 +137,38 @@ describe 'ActiveRecord mixin' do
         data_accessor_for(Post).include = [:location]
       end.results.first
 
-      (Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).should be_true # Rails 3.1 removed "loaded_#{association}" method
+      expect(Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).to be_truthy # Rails 3.1 removed "loaded_#{association}" method
     end
     
     it 'should use the select option from search call to data accessor' do
-      Post.search(:select => 'id, title, body') do
+      expect(Post.search(:select => 'id, title, body') do
         with :title, 'Test Post'
-      end.data_accessor_for(Post).select.should == 'id, title, body'
+      end.data_accessor_for(Post).select).to eq('id, title, body')
     end
     
     it 'should use the select option on the data accessor when specified' do
-      Post.search do
+      expect(Post.search do
         with :title, 'Test Post'
         data_accessor_for(Post).select = 'id, title, body'
-      end.results.first.attribute_names.sort.should == ['body', 'id', 'title']
+      end.results.first.attribute_names.sort).to eq(['body', 'id', 'title'])
     end
     
     it 'should not use the select option on the data accessor when not specified' do
-      Post.search do
+      expect(Post.search do
         with :title, 'Test Post'
-      end.results.first.attribute_names.should == Post.first.attribute_names
+      end.results.first.attribute_names).to eq(Post.first.attribute_names)
     end
 
     it 'should accept an array as a select option' do
-      Post.search(:select => ['id', 'title', 'body']) do
+      expect(Post.search(:select => ['id', 'title', 'body']) do
         with :title, 'Test Post'
-      end.results.first.attribute_names.sort.should == ['body', 'id', 'title']
+      end.results.first.attribute_names.sort).to eq(['body', 'id', 'title'])
     end
 
     it 'should use the scoped option from search call to data accessor' do
-      Post.search(:scopes => [:includes_location]) do
+      expect(Post.search(:scopes => [:includes_location]) do
         with :title, 'Test Post'
-      end.data_accessor_for(Post).scopes.should == [:includes_location]
+      end.data_accessor_for(Post).scopes).to eq([:includes_location])
     end
 
     it 'should use the scopes option on the data accessor when specified' do
@@ -178,16 +178,16 @@ describe 'ActiveRecord mixin' do
         data_accessor_for(Post).scopes = [:includes_location]
       end.results.first
 
-      (Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).should be_true # Rails 3.1 removed "loaded_#{association}" method
+      expect(Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).to be_truthy # Rails 3.1 removed "loaded_#{association}" method
     end
 
     it 'should gracefully handle nonexistent records' do
       post2 = Post.create!(:title => 'Test Post')
       post2.index!
       post2.destroy
-      Post.search do
+      expect(Post.search do
         with :title, 'Test Post'
-      end.results.should == [@post]
+      end.results).to eq([@post])
     end
 
     it 'should use an ActiveRecord object for coordinates' do
@@ -195,7 +195,7 @@ describe 'ActiveRecord mixin' do
       post.location = Location.create!(:lat => 40.0, :lng => -70.0)
       post.save
       post.index!
-      Post.search { with(:location).near(40.0, -70.0) }.results.should == [post]
+      expect(Post.search { with(:location).near(40.0, -70.0) }.results).to eq([post])
     end
 
   end
@@ -207,17 +207,17 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should return IDs' do
-      Post.search_ids.to_set.should == @posts.map { |post| post.id }.to_set
+      expect(Post.search_ids.to_set).to eq(@posts.map { |post| post.id }.to_set)
     end
   end
   
   describe 'searchable?()' do
     it 'should not be true for models that have not been configured for search' do
-      Location.should_not be_searchable
+      expect(Location).not_to be_searchable
     end
 
     it 'should be true for models that have been configured for search' do
-      Post.should be_searchable
+      expect(Post).to be_searchable
     end
   end
 
@@ -229,7 +229,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should return IDs of objects that are in the index but not the database' do
-      Post.index_orphans.should == [@posts.first.id]
+      expect(Post.index_orphans).to eq([@posts.first.id])
     end
   end
 
@@ -243,7 +243,7 @@ describe 'ActiveRecord mixin' do
     it 'should remove orphans from the index' do
       Post.clean_index_orphans
       Sunspot.commit
-      Post.search.results.should == [@posts.last]
+      expect(Post.search.results).to eq([@posts.last])
     end
   end
 
@@ -255,7 +255,7 @@ describe 'ActiveRecord mixin' do
     it 'should index all instances' do
       Post.reindex(:batch_size => nil)
       Sunspot.commit
-      Post.search.results.to_set.should == @posts.to_set
+      expect(Post.search.results.to_set).to eq(@posts.to_set)
     end
 
     it 'should remove all currently indexed instances' do
@@ -264,7 +264,7 @@ describe 'ActiveRecord mixin' do
       old_post.destroy
       Post.reindex
       Sunspot.commit
-      Post.search.results.to_set.should == @posts.to_set
+      expect(Post.search.results.to_set).to eq(@posts.to_set)
     end
     
   end
@@ -277,7 +277,7 @@ describe 'ActiveRecord mixin' do
     it 'should index all instances' do
       Post.reindex(:batch_size => nil)
       Sunspot.commit
-      Post.search.results.to_set.should == @posts.to_set
+      expect(Post.search.results.to_set).to eq(@posts.to_set)
     end
 
     it 'should remove all currently indexed instances' do
@@ -286,14 +286,14 @@ describe 'ActiveRecord mixin' do
       old_post.destroy
       Post.reindex
       Sunspot.commit
-      Post.search.results.to_set.should == @posts.to_set
+      expect(Post.search.results.to_set).to eq(@posts.to_set)
     end
     
     describe "using batch sizes" do
       it 'should index with a specified batch size' do
         Post.reindex(:batch_size => 1)
         Sunspot.commit
-        Post.search.results.to_set.should == @posts.to_set
+        expect(Post.search.results.to_set).to eq(@posts.to_set)
       end
     end
   end
@@ -307,19 +307,19 @@ describe 'ActiveRecord mixin' do
     end
 
     it "should use batches if the batch_size is specified" do
-      relation(Post).class.any_instance.should_receive(:find_in_batches)
+      expect_any_instance_of(relation(Post).class).to receive(:find_in_batches)
       Post.reindex(:batch_size => 50)
     end
 
     it "should select all if the batch_size isn't greater than 0" do
-      relation(Post).class.any_instance.should_not_receive(:find_in_batches)
+      expect_any_instance_of(relation(Post).class).not_to receive(:find_in_batches)
       Post.reindex(:batch_size => nil)
       Post.reindex(:batch_size => 0)
     end
 
     describe "when not using batches" do
       it "should search for models with includes" do
-        Post.should_receive(:includes).with(:author).and_return(relation(Post))
+        expect(Post).to receive(:includes).with(:author).and_return(relation(Post))
         Post.reindex(:batch_size => nil, :include => :author)
       end
 
@@ -335,7 +335,7 @@ describe 'ActiveRecord mixin' do
         it 'should only index those models where :if constraints pass' do
           Post.reindex(:batch_size => nil)
 
-          Post.search.results.should_not include(@posts.first)
+          expect(Post.search.results).not_to include(@posts.first)
         end
       end
     
@@ -343,12 +343,12 @@ describe 'ActiveRecord mixin' do
 
     describe "when using batches" do
       it "should commit after indexing each batch" do
-        Sunspot.should_receive(:commit).twice
+        expect(Sunspot).to receive(:commit).twice
         Post.reindex(:batch_size => 1)
       end
 
       it "should commit after indexing everything" do
-        Sunspot.should_receive(:commit).once
+        expect(Sunspot).to receive(:commit).once
         Post.reindex(:batch_commit => false)
       end
 
@@ -364,7 +364,7 @@ describe 'ActiveRecord mixin' do
         it 'should only index those models where :if constraints pass' do
           Post.reindex(:batch_size => 50)
 
-          Post.search.results.should_not include(@posts.first)
+          expect(Post.search.results).not_to include(@posts.first)
         end
       end
     end
@@ -386,12 +386,13 @@ describe 'ActiveRecord mixin' do
     end
 
     it "should return results" do
-      @posts.first.more_like_this.results.should == [@posts[3], @posts[1]]
+      expect(@posts.first.more_like_this.results).to eq([@posts[3], @posts[1]])
     end
 
     it "should return results for specified classes" do
-      @posts.first.more_like_this(Post, PostWithAuto).results.to_set.should ==
+      expect(@posts.first.more_like_this(Post, PostWithAuto).results.to_set).to eq(
         Set[@posts_with_auto[0], @posts[1], @posts[3]]
+      )
     end
   end
 
@@ -407,7 +408,7 @@ describe 'ActiveRecord mixin' do
     end
 
     it 'should return IDs' do
-      @posts.first.more_like_this_ids.to_set.should == [@posts[3], @posts[1]].map { |post| post.id }.to_set
+      expect(@posts.first.more_like_this_ids.to_set).to eq([@posts[3], @posts[1]].map { |post| post.id }.to_set)
     end
   end
 
@@ -424,7 +425,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns true' do
         # searchable :if => :returns_true
         before do
-          subject.should_receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_true).and_return(true)
           subject.class.sunspot_options[:if] = :returns_true
         end
 
@@ -434,7 +435,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns false' do
         # searchable :if => :returns_false
         before do
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:if] = :returns_false
         end
 
@@ -446,7 +447,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns true' do
         # searchable :if => 'returns_true'
         before do
-          subject.should_receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_true).and_return(true)
           subject.class.sunspot_options[:if] = 'returns_true'
         end
 
@@ -456,7 +457,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns false' do
         # searchable :if => 'returns_false'
         before do
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:if] = 'returns_false'
         end
 
@@ -488,8 +489,8 @@ describe 'ActiveRecord mixin' do
       context 'all constraints returns true' do
         # searchable :if => [:returns_true_1, :returns_true_2]
         before do
-          subject.should_receive(:returns_true_1).and_return(true)
-          subject.should_receive(:returns_true_2).and_return(true)
+          expect(subject).to receive(:returns_true_1).and_return(true)
+          expect(subject).to receive(:returns_true_2).and_return(true)
           subject.class.sunspot_options[:if] = [:returns_true_1, 'returns_true_2']
         end
 
@@ -499,8 +500,8 @@ describe 'ActiveRecord mixin' do
       context 'one constraint returns false' do
         # searchable :if => [:returns_true, :returns_false]
         before do
-          subject.should_receive(:returns_true).and_return(true)
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:if] = [:returns_true, 'returns_false']
         end
 
@@ -511,12 +512,12 @@ describe 'ActiveRecord mixin' do
     it 'removes the model from the index if the constraint does not match' do
       subject.save!
       Sunspot.commit
-      subject.class.search.results.should include(subject)
+      expect(subject.class.search.results).to include(subject)
 
       subject.class.sunspot_options[:if] = proc { false }
       subject.save!
       Sunspot.commit
-      subject.class.search.results.should_not include(subject)
+      expect(subject.class.search.results).not_to include(subject)
     end
   end
 
@@ -533,7 +534,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns true' do
         # searchable :unless => :returns_true
         before do
-          subject.should_receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_true).and_return(true)
           subject.class.sunspot_options[:unless] = :returns_true
         end
 
@@ -543,7 +544,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns false' do
         # searchable :unless => :returns_false
         before do
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:unless] = :returns_false
         end
 
@@ -555,7 +556,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns true' do
         # searchable :unless => 'returns_true'
         before do
-          subject.should_receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_true).and_return(true)
           subject.class.sunspot_options[:unless] = 'returns_true'
         end
 
@@ -565,7 +566,7 @@ describe 'ActiveRecord mixin' do
       context 'constraint returns false' do
         # searchable :unless => 'returns_false'
         before do
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:unless] = 'returns_false'
         end
 
@@ -597,8 +598,8 @@ describe 'ActiveRecord mixin' do
       context 'all constraints returns true' do
         # searchable :unless => [:returns_true_1, :returns_true_2]
         before do
-          subject.should_receive(:returns_true_1).and_return(true)
-          subject.should_receive(:returns_true_2).and_return(true)
+          expect(subject).to receive(:returns_true_1).and_return(true)
+          expect(subject).to receive(:returns_true_2).and_return(true)
           subject.class.sunspot_options[:unless] = [:returns_true_1, 'returns_true_2']
         end
 
@@ -608,8 +609,8 @@ describe 'ActiveRecord mixin' do
       context 'one constraint returns false' do
         # searchable :unless => [:returns_true, :returns_false]
         before do
-          subject.should_receive(:returns_true).and_return(true)
-          subject.should_receive(:returns_false).and_return(false)
+          expect(subject).to receive(:returns_true).and_return(true)
+          expect(subject).to receive(:returns_false).and_return(false)
           subject.class.sunspot_options[:unless] = [:returns_true, 'returns_false']
         end