sunspot_rails 2.2.6 → 2.6.0

data/spec/configuration_spec.rb

@@ -2,195 +2,203 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" do
   before(:each) do
-    File.stub(:exist?).and_return(false) # simulate sunspot.yml not existing
+    allow(File).to receive(:exist?).and_return(false) # simulate sunspot.yml not existing
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'hostname' property when not set" do
-    @config.hostname.should == 'localhost'
+    expect(@config.hostname).to eq('localhost')
   end
 
   it "should handle the 'path' property when not set" do
-    @config.path.should == '/solr/default'
+    expect(@config.path).to eq('/solr/default')
   end
 
   it "should set the scheme to http" do
-    @config.scheme.should == "http"
+    expect(@config.scheme).to eq("http")
   end
 
   it "should not have userinfo" do
-    @config.userinfo.should be_nil
+    expect(@config.userinfo).to be_nil
   end
 
   it "should not set a proxy" do
-    @config.proxy.should be_nil
+    expect(@config.proxy).to be_nil
   end
 
   describe "port" do
     it "should default to port 8981 in test" do
-      ::Rails.stub(:env => 'test')
+      allow(::Rails).to receive(:env).and_return('test')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8981
+      expect(@config.port).to eq(8981)
     end
     it "should default to port 8982 in development" do
-      ::Rails.stub(:env => 'development')
+      allow(::Rails).to receive(:env).and_return('development')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8982
+      expect(@config.port).to eq(8982)
     end
     it "should default to 8983 in production" do
-      ::Rails.stub(:env => 'production')
+      allow(::Rails).to receive(:env).and_return('production')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8983
+      expect(@config.port).to eq(8983)
     end
     it "should generally default to 8983" do
-      ::Rails.stub(:env => 'staging')
+      allow(::Rails).to receive(:env).and_return('staging')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8983
+      expect(@config.port).to eq(8983)
     end
   end
 
   it "should set the read timeout to nil when not set" do
-    @config.read_timeout == nil
+    expect(@config.read_timeout).to be_nil
   end
 
   it "should set the open timeout to nil when not set" do
-    @config.open_timeout == nil
+    expect(@config.open_timeout).to be_nil
+  end
+
+  it "should set the update_format to nil when not set" do
+    expect(@config.update_format).to be_nil
   end
 
   it "should set 'log_level' property using Rails log level when not set" do
-    ::Rails.logger.stub(:level){ 3 }
-    @config.log_level.should == 'SEVERE'
+    allow(::Rails.logger).to receive(:level){ 3 }
+    expect(@config.log_level).to eq('SEVERE')
   end
 
   it "should handle the 'log_file' property" do
-    @config.log_file.should =~ /log\/solr_test.log/
+    expect(@config.log_file).to match(/log\/solr_test.log/)
   end
 
   it "should handle the 'solr_home' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.solr_home.should == '/some/path/solr'
+    expect(Rails).to receive(:root).at_least(1).and_return('/some/path')
+    expect(@config.solr_home).to eq('/some/path/solr')
   end
 
   it "should handle the 'pid_dir' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.pid_dir.should == '/some/path/solr/pids/test'
+    expect(Rails).to receive(:root).at_least(1).and_return('/some/path')
+    expect(@config.pid_dir).to eq('/some/path/solr/pids/test')
   end
 
   it "should handle the 'auto_commit_after_request' propery when not set" do
-    @config.auto_commit_after_request?.should == true
+    expect(@config.auto_commit_after_request?).to eq(true)
   end
 
   it "should handle the 'auto_commit_after_delete_request' propery when not set" do
-    @config.auto_commit_after_delete_request?.should == false
+    expect(@config.auto_commit_after_delete_request?).to eq(false)
   end
 
   it "should handle the 'bind_address' property when not set" do
-    @config.bind_address.should be_nil
+    expect(@config.bind_address).to be_nil
   end
 
   it "should handle the 'disabled' property when not set" do
-    @config.disabled?.should be_false
+    expect(@config.disabled?).to be_falsey
   end
 
   it "should handle the 'auto_index_callback' property when not set" do
-    @config.auto_index_callback.should == "after_save"
+    expect(@config.auto_index_callback).to eq("after_save")
   end
 
   it "should handle the 'auto_remove_callback' property when not set" do
-    @config.auto_remove_callback.should == "after_destroy"
+    expect(@config.auto_remove_callback).to eq("after_destroy")
   end
 end
 
 describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'scheme' property when set" do
-    @config.scheme.should == "http"
+    expect(@config.scheme).to eq("http")
   end
 
   it "should handle the 'user' and 'pass' properties when set" do
-    @config.userinfo.should == "user:pass"
+    expect(@config.userinfo).to eq("user:pass")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'some.host'
+    expect(@config.hostname).to eq('some.host')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 1234
+    expect(@config.port).to eq(1234)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/idx'
+    expect(@config.path).to eq('/solr/idx')
   end
 
   it "should handle the 'log_level' propery when set" do
-    @config.log_level.should == 'WARNING'
+    expect(@config.log_level).to eq('WARNING')
   end
 
   it "should handle the 'solr_home' propery when set" do
-    @config.solr_home.should == '/my_superior_path'
+    expect(@config.solr_home).to eq('/my_superior_path')
   end
 
   it "should handle the 'pid_dir' property when set" do
-    @config.pid_dir.should == '/my_superior_path/pids'
+    expect(@config.pid_dir).to eq('/my_superior_path/pids')
   end
 
   it "should handle the 'solr_home' property when set" do
-    @config.solr_home.should == '/my_superior_path'
+    expect(@config.solr_home).to eq('/my_superior_path')
   end
 
   it "should handle the 'auto_commit_after_request' propery when set" do
-    @config.auto_commit_after_request?.should == false
+    expect(@config.auto_commit_after_request?).to eq(false)
   end
 
   it "should handle the 'auto_commit_after_delete_request' propery when set" do
-    @config.auto_commit_after_delete_request?.should == true
+    expect(@config.auto_commit_after_delete_request?).to eq(true)
   end
 
   it "should handle the 'bind_address' property when set" do
-    @config.bind_address.should == "127.0.0.1"
+    expect(@config.bind_address).to eq("127.0.0.1")
   end
 
   it "should handle the 'read_timeout' property when set" do
-    @config.read_timeout.should == 2
+    expect(@config.read_timeout).to eq(2)
   end
 
   it "should handle the 'open_timeout' property when set" do
-    @config.open_timeout.should == 0.5
+    expect(@config.open_timeout).to eq(0.5)
+  end
+
+  it "should handle the 'update_format' property when set" do
+    expect(@config.update_format).to eq('json')
   end
 
   it "should handle the 'proxy' property when set" do
-    @config.proxy.should == 'http://proxy.com:12345'
+    expect(@config.proxy).to eq('http://proxy.com:12345')
   end
 end
 
 describe Sunspot::Rails::Configuration, "with auto_index_callback and auto_remove_callback set" do
   before do
-    ::Rails.stub(:env => 'config_commit_test')
+    allow(::Rails).to receive(:env).and_return('config_commit_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'auto_index_callback' property when set" do
-    @config.auto_index_callback.should == "after_commit"
+    expect(@config.auto_index_callback).to eq("after_commit")
   end
 
   it "should handle the 'auto_remove_callback' property when set" do
-    @config.auto_remove_callback.should == "after_commit"
+    expect(@config.auto_remove_callback).to eq("after_commit")
   end
 end
 
 describe Sunspot::Rails::Configuration, "with disabled: true in sunspot.yml" do
   before(:each) do
-    ::Rails.stub(:env => 'config_disabled_test')
+    allow(::Rails).to receive(:env).and_return('config_disabled_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'disabled' property when set" do
-    @config.disabled?.should be_true
+    expect(@config.disabled?).to be_truthy
   end
 end
 
@@ -200,7 +208,7 @@ describe Sunspot::Rails::Configuration, "with ENV['SOLR_URL'] overriding sunspot
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -209,15 +217,15 @@ describe Sunspot::Rails::Configuration, "with ENV['SOLR_URL'] overriding sunspot
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'environment.host'
+    expect(@config.hostname).to eq('environment.host')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 5432
+    expect(@config.port).to eq(5432)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/env'
+    expect(@config.path).to eq('/solr/env')
   end
 end
 
@@ -227,7 +235,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] overriding suns
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -236,15 +244,15 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] overriding suns
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 80
+    expect(@config.port).to eq(80)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end
 
@@ -254,7 +262,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] using https" do
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -263,19 +271,19 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] using https" do
   end
 
   it "should set the scheme to https" do
-    @config.scheme.should == "https"
+    expect(@config.scheme).to eq("https")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 443
+    expect(@config.port).to eq(443)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end
 
@@ -285,7 +293,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] including useri
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -294,22 +302,22 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] including useri
   end
 
   it "should include username and passowrd" do
-    @config.userinfo.should == "user:pass"
+    expect(@config.userinfo).to eq("user:pass")
   end
 
   it "should set the scheme to https" do
-    @config.scheme.should == "https"
+    expect(@config.scheme).to eq("https")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 443
+    expect(@config.port).to eq(443)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end

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