pg_search 0.7.4 → 0.7.5

data/spec/lib/pg_search/document_spec.rb

@@ -28,21 +28,28 @@ describe PgSearch::Document do
         let(:multisearchable_options) { {:against => :some_content} }
         let(:text) { "foo bar" }
         before do
-          searchable.stub(:some_content => text)
+          allow(searchable).to receive(:some_content) { text }
           document.valid?
         end
 
-        its(:content) { should == text }
+        describe '#content' do
+          subject { super().content }
+          it { should == text }
+        end
       end
 
       context "when searching against multiple columns" do
         let(:multisearchable_options) { {:against => [:attr1, :attr2]} }
         before do
-          searchable.stub(:attr1 => "1", :attr2 => "2")
+          allow(searchable).to receive(:attr1) { '1' }
+          allow(searchable).to receive(:attr2) { '2' }
           document.valid?
         end
 
-        its(:content) { should == "1 2" }
+        describe '#content' do
+          subject { super().content }
+          it { should == "1 2" }
+        end
       end
     end
   end

data/spec/lib/pg_search/features/dmetaphone_spec.rb

@@ -20,8 +20,9 @@ describe PgSearch::Features::DMetaphone do
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
-      feature.rank.to_sql.should ==
+      expect(feature.rank.to_sql).to eq(
         %Q{(ts_rank((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))), (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')), 0))}
+      )
     end
   end
 
@@ -44,8 +45,9 @@ describe PgSearch::Features::DMetaphone do
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
-      feature.conditions.to_sql.should ==
+      expect(feature.conditions.to_sql).to eq(
         %Q{((to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."name"::text, ''))) || to_tsvector('simple', pg_search_dmetaphone(coalesce(#{Model.quoted_table_name}."content"::text, '')))) @@ (to_tsquery('simple', ''' ' || pg_search_dmetaphone('query') || ' ''')))}
+      )
     end
   end
 end

data/spec/lib/pg_search/features/tsearch_spec.rb

@@ -20,8 +20,9 @@ describe PgSearch::Features::TSearch do
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
-      feature.rank.to_sql.should ==
+      expect(feature.rank.to_sql).to eq(
         %Q{(ts_rank((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 0))}
+      )
     end
   end
 
@@ -44,8 +45,9 @@ describe PgSearch::Features::TSearch do
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
-      feature.conditions.to_sql.should ==
+      expect(feature.conditions.to_sql).to eq(
         %Q{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+      )
     end
   end
 end

data/spec/lib/pg_search/multisearch/rebuilder_spec.rb

@@ -18,7 +18,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
         it "should call .rebuild_pg_search_documents" do
           rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
-          Model.should_receive(:rebuild_pg_search_documents)
+          expect(Model).to receive(:rebuild_pg_search_documents)
           rebuilder.rebuild
         end
       end
@@ -42,7 +42,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
             it "should call .rebuild_pg_search_documents" do
               rebuilder = PgSearch::Multisearch::Rebuilder.new(Model)
-              Model.should_receive(:rebuild_pg_search_documents)
+              expect(Model).to receive(:rebuild_pg_search_documents)
               rebuilder.rebuild
             end
           end
@@ -68,7 +68,7 @@ describe PgSearch::Multisearch::Rebuilder do
 
           # stub respond_to? to return false since should_not_receive defines the method
           original_respond_to = Model.method(:respond_to?)
-          Model.stub(:respond_to?) do |method_name, *args|
+          allow(Model).to receive(:respond_to?) do |method_name, *args|
             if method_name == :rebuild_pg_search_documents
               false
             else
@@ -76,7 +76,7 @@ describe PgSearch::Multisearch::Rebuilder do
             end
           end
 
-          Model.should_not_receive(:rebuild_pg_search_documents)
+          expect(Model).not_to receive(:rebuild_pg_search_documents)
           rebuilder.rebuild
         end
 
@@ -120,8 +120,8 @@ describe PgSearch::Multisearch::Rebuilder do
           rebuilder.rebuild
           ActiveSupport::Notifications.unsubscribe(notifier)
 
-          executed_sql.length.should == 1
-          executed_sql.first.should == expected_sql
+          expect(executed_sql.length).to eq(1)
+          expect(executed_sql.first).to eq(expected_sql)
         end
 
         context "for a model with a non-standard primary key" do
@@ -176,8 +176,8 @@ describe PgSearch::Multisearch::Rebuilder do
             rebuilder.rebuild
             ActiveSupport::Notifications.unsubscribe(notifier)
 
-            executed_sql.length.should == 1
-            executed_sql.first.should == expected_sql
+            expect(executed_sql.length).to eq(1)
+            expect(executed_sql.first).to eq(expected_sql)
           end
         end
       end
@@ -203,19 +203,19 @@ describe PgSearch::Multisearch::Rebuilder do
 
             # stub respond_to? to return false since should_not_receive defines the method
             original_respond_to = Model.method(:respond_to?)
-            Model.stub(:respond_to?) do |method_name, *args|
+            allow(Model).to receive(:respond_to?) do |method_name, *args|
               if method_name == :rebuild_pg_search_documents
                 false
               else
                 original_respond_to.call(method_name, *args)
               end
             end
-            Model.should_not_receive(:rebuild_pg_search_documents)
+            expect(Model).not_to receive(:rebuild_pg_search_documents)
 
             rebuilder.rebuild
 
-            record1.pg_search_document.should be_present
-            record2.pg_search_document.should_not be_present
+            expect(record1.pg_search_document).to be_present
+            expect(record2.pg_search_document).not_to be_present
           end
         end
 
@@ -239,19 +239,19 @@ describe PgSearch::Multisearch::Rebuilder do
 
             # stub respond_to? to return false since should_not_receive defines the method
             original_respond_to = Model.method(:respond_to?)
-            Model.stub(:respond_to?) do |method_name, *args|
+            allow(Model).to receive(:respond_to?) do |method_name, *args|
               if method_name == :rebuild_pg_search_documents
                 false
               else
                 original_respond_to.call(method_name, *args)
               end
             end
-            Model.should_not_receive(:rebuild_pg_search_documents)
+            expect(Model).not_to receive(:rebuild_pg_search_documents)
 
             rebuilder.rebuild
 
-            record1.pg_search_document.should_not be_present
-            record2.pg_search_document.should be_present
+            expect(record1.pg_search_document).not_to be_present
+            expect(record2.pg_search_document).to be_present
           end
         end
       end

data/spec/lib/pg_search/multisearch_spec.rb

@@ -24,7 +24,7 @@ describe PgSearch::Multisearch do
     end
 
     it "should operate inside a transaction" do
-      model.should_receive(:transaction).once
+      expect(model).to receive(:transaction).once
 
       PgSearch::Multisearch.rebuild(model)
     end
@@ -41,14 +41,14 @@ describe PgSearch::Multisearch do
             VALUES
             ('Bar', 123, 'foo', now(), now());
         SQL
-        PgSearch::Document.count.should == 2
+        expect(PgSearch::Document.count).to eq(2)
       end
 
       context "when clean_up is not passed" do
         it "should delete the document for the model" do
           PgSearch::Multisearch.rebuild(model)
-          PgSearch::Document.count.should == 1
-          PgSearch::Document.first.searchable_type.should == "Bar"
+          expect(PgSearch::Document.count).to eq(1)
+          expect(PgSearch::Document.first.searchable_type).to eq("Bar")
         end
       end
 
@@ -57,8 +57,8 @@ describe PgSearch::Multisearch do
 
         it "should delete the document for the model" do
           PgSearch::Multisearch.rebuild(model, clean_up)
-          PgSearch::Document.count.should == 1
-          PgSearch::Document.first.searchable_type.should == "Bar"
+          expect(PgSearch::Document.count).to eq(1)
+          expect(PgSearch::Document.first.searchable_type).to eq("Bar")
         end
       end
 
@@ -67,7 +67,7 @@ describe PgSearch::Multisearch do
 
         it "should not delete the document for the model" do
           PgSearch::Multisearch.rebuild(model, clean_up)
-          PgSearch::Document.count.should == 2
+          expect(PgSearch::Document.count).to eq(2)
         end
       end
 
@@ -84,11 +84,11 @@ describe PgSearch::Multisearch do
         end
 
         it "should call .rebuild_pg_search_documents and skip the default behavior" do
-          PgSearch::Multisearch.should_not_receive(:rebuild_sql)
+          expect(PgSearch::Multisearch).not_to receive(:rebuild_sql)
           PgSearch::Multisearch.rebuild(model)
 
           record = PgSearch::Document.find_by_searchable_type_and_searchable_id("Baz", 789)
-          record.content.should == "baz"
+          expect(record.content).to eq("baz")
         end
       end
     end
@@ -102,16 +102,13 @@ describe PgSearch::Multisearch do
 
       it "should create new documents for the two models" do
         PgSearch::Multisearch.rebuild(model)
-        PgSearch::Document.last(2).map(&:searchable).map(&:title).should =~ new_models.map(&:title)
+        expect(PgSearch::Document.last(2).map(&:searchable).map(&:title)).to match_array(new_models.map(&:title))
       end
     end
 
     describe "the generated SQL" do
       let(:now) { Time.now }
-
-      before do
-        Time.stub(:now => now)
-      end
+      before { allow(Time).to receive(:now).and_return(now) }
 
       context "with one attribute" do
         before do
@@ -132,11 +129,11 @@ describe PgSearch::Multisearch do
           SQL
 
           statements = []
-          connection.stub(:execute) { |sql| statements << sql }
+          allow(connection).to receive(:execute) { |sql| statements << sql }
 
           PgSearch::Multisearch.rebuild(model)
 
-          statements.should include(expected_sql)
+          expect(statements).to include(expected_sql)
         end
       end
 
@@ -159,11 +156,11 @@ describe PgSearch::Multisearch do
           SQL
 
           statements = []
-          connection.stub(:execute) { |sql| statements << sql }
+          allow(connection).to receive(:execute) { |sql| statements << sql }
 
           PgSearch::Multisearch.rebuild(model)
 
-          statements.should include(expected_sql)
+          expect(statements).to include(expected_sql)
         end
       end
     end

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -21,7 +21,7 @@ describe PgSearch::Multisearchable do
           end
 
           context "with multisearch disabled" do
-            before { PgSearch.stub(:multisearch_enabled? => false) }
+            before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
             it "should not create a PgSearch::Document record" do
               expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -33,8 +33,8 @@ describe PgSearch::Multisearchable do
           it "should be associated to the record" do
             record.save!
             newest_pg_search_document = PgSearch::Document.last
-            record.pg_search_document.should == newest_pg_search_document
-            newest_pg_search_document.searchable.should == record
+            expect(record.pg_search_document).to eq(newest_pg_search_document)
+            expect(newest_pg_search_document.searchable).to eq(record)
           end
         end
       end
@@ -43,11 +43,11 @@ describe PgSearch::Multisearchable do
         let!(:record) { ModelThatIsMultisearchable.create! }
 
         context "when the document is present" do
-          before { record.pg_search_document.should be_present }
+          before { expect(record.pg_search_document).to be_present }
 
           describe "saving the record" do
             it "calls save on the pg_search_document" do
-              record.pg_search_document.should_receive(:save)
+              expect(record.pg_search_document).to receive(:save)
               record.save!
             end
 
@@ -56,10 +56,10 @@ describe PgSearch::Multisearchable do
             end
 
             context "with multisearch disabled" do
-              before { PgSearch.stub(:multisearch_enabled? => false) }
+              before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
               it "should not create a PgSearch::Document record" do
-                record.pg_search_document.should_not_receive(:save)
+                expect(record.pg_search_document).not_to receive(:save)
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -75,7 +75,7 @@ describe PgSearch::Multisearchable do
             end
 
             context "with multisearch disabled" do
-              before { PgSearch.stub(:multisearch_enabled? => false) }
+              before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
               it "should not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -120,7 +120,7 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -142,12 +142,12 @@ describe PgSearch::Multisearchable do
           let(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
 
           context "when the document is present" do
-            before { record.pg_search_document.should be_present }
+            before { expect(record.pg_search_document).to be_present }
 
             describe "saving the record" do
               context "when the condition is true" do
                 it "calls save on the pg_search_document" do
-                  record.pg_search_document.should_receive(:save)
+                  expect(record.pg_search_document).to receive(:save)
                   record.save!
                 end
 
@@ -160,7 +160,7 @@ describe PgSearch::Multisearchable do
                 before { record.multisearchable = false }
 
                 it "calls destroy on the pg_search_document" do
-                  record.pg_search_document.should_receive(:destroy)
+                  expect(record.pg_search_document).to receive(:destroy)
                   record.save!
                 end
 
@@ -173,11 +173,11 @@ describe PgSearch::Multisearchable do
 
               context "with multisearch disabled" do
                 before do
-                  PgSearch.stub(:multisearch_enabled? => false)
-                  record.pg_search_document.should_not_receive(:save)
+                  allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
                 end
 
                 it "should not create a PgSearch::Document record" do
+                  expect(record.pg_search_document).not_to receive(:save)
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -194,7 +194,7 @@ describe PgSearch::Multisearchable do
                 end
 
                 context "with multisearch disabled" do
-                  before { PgSearch.stub(:multisearch_enabled? => false) }
+                  before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                   it "should not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -248,7 +248,7 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -270,12 +270,12 @@ describe PgSearch::Multisearchable do
           let!(:record) { ModelThatIsMultisearchable.create!(:not_multisearchable => false) }
 
           context "when the document is present" do
-            before { record.pg_search_document.should be_present }
+            before { expect(record.pg_search_document).to be_present }
 
             describe "saving the record" do
               context "when the condition is false" do
                 it "calls save on the pg_search_document" do
-                  record.pg_search_document.should_receive(:save)
+                  expect(record.pg_search_document).to receive(:save)
                   record.save!
                 end
 
@@ -285,8 +285,8 @@ describe PgSearch::Multisearchable do
 
                 context "with multisearch disabled" do
                   before do
-                    PgSearch.stub(:multisearch_enabled? => false)
-                    record.pg_search_document.should_not_receive(:save)
+                    allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
+                    expect(record.pg_search_document).not_to receive(:save)
                   end
 
                   it "should not create a PgSearch::Document record" do
@@ -299,7 +299,7 @@ describe PgSearch::Multisearchable do
                 before { record.not_multisearchable = true }
 
                 it "calls destroy on the pg_search_document" do
-                  record.pg_search_document.should_receive(:destroy)
+                  expect(record.pg_search_document).to receive(:destroy)
                   record.save!
                 end
 
@@ -332,7 +332,8 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
+
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
@@ -377,7 +378,7 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -399,12 +400,12 @@ describe PgSearch::Multisearchable do
           let!(:record) { ModelThatIsMultisearchable.create!(:multisearchable => true) }
 
           context "when the document is present" do
-            before { record.pg_search_document.should be_present }
+            before { expect(record.pg_search_document).to be_present }
 
             describe "saving the record" do
               context "when the condition is true" do
                 it "calls save on the pg_search_document" do
-                  record.pg_search_document.should_receive(:save)
+                  expect(record.pg_search_document).to receive(:save)
                   record.save!
                 end
 
@@ -414,8 +415,8 @@ describe PgSearch::Multisearchable do
 
                 context "with multisearch disabled" do
                   before do
-                    PgSearch.stub(:multisearch_enabled? => false)
-                    record.pg_search_document.should_not_receive(:save)
+                    allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
+                    expect(record.pg_search_document).not_to receive(:save)
                   end
 
                   it "should not create a PgSearch::Document record" do
@@ -428,7 +429,7 @@ describe PgSearch::Multisearchable do
                 before { record.multisearchable = false }
 
                 it "calls destroy on the pg_search_document" do
-                  record.pg_search_document.should_receive(:destroy)
+                  expect(record.pg_search_document).to receive(:destroy)
                   record.save!
                 end
 
@@ -446,7 +447,7 @@ describe PgSearch::Multisearchable do
 
             describe "saving the record" do
               context "with multisearch enabled" do
-                before { PgSearch.stub(:multisearch_enabled? => true) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(true) }
 
                 context "when the condition is true" do
                   it "should create a PgSearch::Document record" do
@@ -464,7 +465,7 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -517,7 +518,7 @@ describe PgSearch::Multisearchable do
               end
 
               context "with multisearch disabled" do
-                before { PgSearch.stub(:multisearch_enabled? => false) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                 it "should not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
@@ -531,14 +532,14 @@ describe PgSearch::Multisearchable do
           let!(:record) { ModelThatIsMultisearchable.create!(:not_multisearchable => false) }
 
           context "when the document is present" do
-            before { record.pg_search_document.should be_present }
+            before { expect(record.pg_search_document).to be_present }
 
             describe "saving the record" do
               context "when the condition is true" do
                 before { record.not_multisearchable = true }
 
                 it "calls destroy on the pg_search_document" do
-                  record.pg_search_document.should_receive(:destroy)
+                  expect(record.pg_search_document).to receive(:destroy)
                   record.save!
                 end
 
@@ -551,7 +552,7 @@ describe PgSearch::Multisearchable do
 
               context "when the condition is false" do
                 it "calls save on the pg_search_document" do
-                  record.pg_search_document.should_receive(:save)
+                  expect(record.pg_search_document).to receive(:save)
                   record.save!
                 end
 
@@ -561,8 +562,8 @@ describe PgSearch::Multisearchable do
 
                 context "with multisearch disabled" do
                   before do
-                    PgSearch.stub(:multisearch_enabled? => false)
-                    record.pg_search_document.should_not_receive(:save)
+                    allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
+                    expect(record.pg_search_document).not_to receive(:save)
                   end
 
                   it "should not create a PgSearch::Document record" do
@@ -578,7 +579,7 @@ describe PgSearch::Multisearchable do
 
             describe "saving the record" do
               context "with multisearch enabled" do
-                before { PgSearch.stub(:multisearch_enabled? => true) }
+                before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(true) }
 
                 context "when the condition is true" do
                   before { record.not_multisearchable = true }
@@ -594,7 +595,7 @@ describe PgSearch::Multisearchable do
                   end
 
                   context "with multisearch disabled" do
-                    before { PgSearch.stub(:multisearch_enabled? => false) }
+                    before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
                     it "should not create a PgSearch::Document record" do
                       expect { record.save! }.not_to change(PgSearch::Document, :count)

data/spec/lib/pg_search/normalizer_spec.rb

@@ -10,18 +10,18 @@ describe PgSearch::Normalizer do
             node = Arel::Nodes::NamedFunction.new("foo", ["bar"])
 
             normalizer = PgSearch::Normalizer.new(config)
-            normalizer.add_normalization(node).should == "unaccent(foo('bar'))"
+            expect(normalizer.add_normalization(node)).to eq("unaccent(foo('bar'))")
           end
 
           context "when a custom unaccent function is specified" do
             it "wraps the expression in that function" do
-              PgSearch.stub(:unaccent_function).and_return("my_unaccent")
+              allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
               node = Arel::Nodes::NamedFunction.new("foo", ["bar"])
 
               config = double("config", :ignore => [:accents], :postgresql_version => 90000)
 
               normalizer = PgSearch::Normalizer.new(config)
-              normalizer.add_normalization(node).should == "my_unaccent(foo('bar'))"
+              expect(normalizer.add_normalization(node)).to eq("my_unaccent(foo('bar'))")
             end
           end
         end
@@ -31,17 +31,17 @@ describe PgSearch::Normalizer do
             config = double("config", :ignore => [:accents], :postgresql_version => 90000)
 
             normalizer = PgSearch::Normalizer.new(config)
-            normalizer.add_normalization("foo").should == "unaccent(foo)"
+            expect(normalizer.add_normalization("foo")).to eq("unaccent(foo)")
           end
 
           context "when a custom unaccent function is specified" do
             it "wraps the expression in that function" do
-              PgSearch.stub(:unaccent_function).and_return("my_unaccent")
+              allow(PgSearch).to receive(:unaccent_function).and_return("my_unaccent")
 
               config = double("config", :ignore => [:accents], :postgresql_version => 90000)
 
               normalizer = PgSearch::Normalizer.new(config)
-              normalizer.add_normalization("foo").should == "my_unaccent(foo)"
+              expect(normalizer.add_normalization("foo")).to eq("my_unaccent(foo)")
             end
           end
         end
@@ -52,7 +52,7 @@ describe PgSearch::Normalizer do
           config = double("config", :ignore => [], :postgresql_version => 90000)
 
           normalizer = PgSearch::Normalizer.new(config)
-          normalizer.add_normalization("foo").should == "foo"
+          expect(normalizer.add_normalization("foo")).to eq("foo")
         end
       end
     end
@@ -74,7 +74,7 @@ describe PgSearch::Normalizer do
           config = double("config", :ignore => [], :postgresql_version => 90000)
 
           normalizer = PgSearch::Normalizer.new(config)
-          normalizer.add_normalization("foo").should == "foo"
+          expect(normalizer.add_normalization("foo")).to eq("foo")
         end
       end
     end