pg_search 2.1.7 → 2.3.3

data/spec/lib/pg_search/multisearch_spec.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "active_support/deprecation"
 
+# rubocop:disable RSpec/NestedGroups
 describe PgSearch::Multisearch do
-  with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+  with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
   with_model :MultisearchableModel do
     table do |t|
@@ -12,28 +14,28 @@ describe PgSearch::Multisearch do
       t.timestamps null: false
     end
     model do
-      include PgSearch
+      include PgSearch::Model
     end
   end
 
   let(:model) { MultisearchableModel }
   let(:connection) { model.connection }
-  let(:documents) { double(:documents) }
 
   describe ".rebuild" do
     before do
       model.multisearchable against: :title
     end
 
-    it "should operate inside a transaction" do
-      expect(model).to receive(:transaction).once
+    it "operates inside a transaction" do
+      allow(model).to receive(:transaction)
 
-      PgSearch::Multisearch.rebuild(model)
+      described_class.rebuild(model)
+      expect(model).to have_received(:transaction).once
     end
 
     describe "cleaning up search documents for this model" do
       before do
-        connection.execute <<-SQL.strip_heredoc
+        connection.execute <<~SQL.squish
           INSERT INTO pg_search_documents
             (searchable_type, searchable_id, content, created_at, updated_at)
             VALUES
@@ -47,28 +49,39 @@ describe PgSearch::Multisearch do
       end
 
       context "when clean_up is not passed" do
-        it "should delete the document for the model" do
-          PgSearch::Multisearch.rebuild(model)
+        it "deletes the document for the model" do
+          described_class.rebuild(model)
           expect(PgSearch::Document.count).to eq(1)
           expect(PgSearch::Document.first.searchable_type).to eq("Bar")
         end
       end
 
       context "when clean_up is true" do
-        let(:clean_up) { true }
-
-        it "should delete the document for the model" do
-          PgSearch::Multisearch.rebuild(model, clean_up)
+        it "deletes the document for the model" do
+          described_class.rebuild(model, clean_up: true)
           expect(PgSearch::Document.count).to eq(1)
           expect(PgSearch::Document.first.searchable_type).to eq("Bar")
         end
       end
 
       context "when clean_up is false" do
-        let(:clean_up) { false }
+        it "does not delete the document for the model" do
+          described_class.rebuild(model, clean_up: false)
+          expect(PgSearch::Document.count).to eq(2)
+        end
+      end
+
+      context "when deprecated_clean_up is true" do
+        it "deletes the document for the model" do
+          ActiveSupport::Deprecation.silence { described_class.rebuild(model, true) }
+          expect(PgSearch::Document.count).to eq(1)
+          expect(PgSearch::Document.first.searchable_type).to eq("Bar")
+        end
+      end
 
-        it "should not delete the document for the model" do
-          PgSearch::Multisearch.rebuild(model, clean_up)
+      context "when deprecated_clean_up is false" do
+        it "does not delete the document for the model" do
+          ActiveSupport::Deprecation.silence { described_class.rebuild(model, false) }
           expect(PgSearch::Document.count).to eq(2)
         end
       end
@@ -76,7 +89,7 @@ describe PgSearch::Multisearch do
       context "when the model implements .rebuild_pg_search_documents" do
         before do
           def model.rebuild_pg_search_documents
-            connection.execute <<-SQL.strip_heredoc
+            connection.execute <<~SQL.squish
               INSERT INTO pg_search_documents
                 (searchable_type, searchable_id, content, created_at, updated_at)
                 VALUES
@@ -85,31 +98,36 @@ describe PgSearch::Multisearch do
           end
         end
 
-        it "should call .rebuild_pg_search_documents and skip the default behavior" do
-          expect(PgSearch::Multisearch).not_to receive(:rebuild_sql)
-          PgSearch::Multisearch.rebuild(model)
+        it "calls .rebuild_pg_search_documents and skips the default behavior" do
+          without_partial_double_verification do
+            allow(model).to receive(:rebuild_sql)
+            described_class.rebuild(model)
 
-          record = PgSearch::Document.find_by_searchable_type_and_searchable_id("Baz", 789)
-          expect(record.content).to eq("baz")
+            record = PgSearch::Document.find_by(searchable_type: "Baz", searchable_id: 789)
+            expect(model).not_to have_received(:rebuild_sql)
+            expect(record.content).to eq("baz")
+          end
         end
       end
     end
 
     describe "inserting the new documents" do
       let!(:new_models) { [] }
+
       before do
         new_models << model.create!(title: "Foo", content: "Bar")
         new_models << model.create!(title: "Baz", content: "Bar")
       end
 
-      it "should create new documents for the two models" do
-        PgSearch::Multisearch.rebuild(model)
+      it "creates new documents for the two models" do
+        described_class.rebuild(model)
         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 { allow(Time).to receive(:now).and_return(now) }
 
       context "with one attribute" do
@@ -117,8 +135,8 @@ describe PgSearch::Multisearch do
           model.multisearchable against: [:title]
         end
 
-        it "should generate the proper SQL code" do
-          expected_sql = <<-SQL.strip_heredoc
+        it "generates the proper SQL code" do
+          expected_sql = <<~SQL.squish
             INSERT INTO #{PgSearch::Document.quoted_table_name} (searchable_type, searchable_id, content, created_at, updated_at)
               SELECT #{connection.quote(model.name)} AS searchable_type,
                      #{model.quoted_table_name}.id AS searchable_id,
@@ -133,7 +151,7 @@ describe PgSearch::Multisearch do
           statements = []
           allow(connection).to receive(:execute) { |sql| statements << sql.strip }
 
-          PgSearch::Multisearch.rebuild(model)
+          described_class.rebuild(model)
 
           expect(statements).to include(expected_sql.strip)
         end
@@ -144,8 +162,8 @@ describe PgSearch::Multisearch do
           model.multisearchable against: %i[title content]
         end
 
-        it "should generate the proper SQL code" do
-          expected_sql = <<-SQL.strip_heredoc
+        it "generates the proper SQL code" do
+          expected_sql = <<~SQL.squish
             INSERT INTO #{PgSearch::Document.quoted_table_name} (searchable_type, searchable_id, content, created_at, updated_at)
               SELECT #{connection.quote(model.name)} AS searchable_type,
                      #{model.quoted_table_name}.id AS searchable_id,
@@ -160,7 +178,7 @@ describe PgSearch::Multisearch do
           statements = []
           allow(connection).to receive(:execute) { |sql| statements << sql.strip }
 
-          PgSearch::Multisearch.rebuild(model)
+          described_class.rebuild(model)
 
           expect(statements).to include(expected_sql.strip)
         end
@@ -168,3 +186,4 @@ describe PgSearch::Multisearch do
     end
   end
 end
+# rubocop:enable RSpec/NestedGroups

data/spec/lib/pg_search/multisearchable_spec.rb

@@ -2,13 +2,14 @@
 
 require "spec_helper"
 
+# rubocop:disable RSpec/NestedGroups
 describe PgSearch::Multisearchable do
-  with_table "pg_search_documents", {}, &DOCUMENTS_SCHEMA
+  with_table "pg_search_documents", &DOCUMENTS_SCHEMA
 
   describe "a model that is multisearchable" do
     with_model :ModelThatIsMultisearchable do
       model do
-        include PgSearch
+        include PgSearch::Model
         multisearchable
       end
     end
@@ -19,7 +20,7 @@ describe PgSearch::Multisearchable do
       end
 
       model do
-        include PgSearch
+        include PgSearch::Model
         multisearchable
 
         has_many :multisearchable_children, dependent: :destroy
@@ -35,7 +36,7 @@ describe PgSearch::Multisearchable do
         belongs_to :multisearchable_parent
 
         after_destroy do
-          multisearchable_parent.update_attribute(:secret, rand(1000).to_s)
+          multisearchable_parent.update_attribute(:secret, rand(1000).to_s) # rubocop:disable Rails/SkipsModelValidations
         end
       end
     end
@@ -45,21 +46,21 @@ describe PgSearch::Multisearchable do
         let(:record) { ModelThatIsMultisearchable.new }
 
         describe "saving the record" do
-          it "should create a PgSearch::Document record" do
+          it "creates a PgSearch::Document record" do
             expect { record.save! }.to change(PgSearch::Document, :count).by(1)
           end
 
           context "with multisearch disabled" do
             before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-            it "should not create a PgSearch::Document record" do
+            it "does not create a PgSearch::Document record" do
               expect { record.save! }.not_to change(PgSearch::Document, :count)
             end
           end
         end
 
         describe "the document" do
-          it "should be associated to the record" do
+          it "is associated to the record" do
             record.save!
             newest_pg_search_document = PgSearch::Document.last
             expect(record.pg_search_document).to eq(newest_pg_search_document)
@@ -76,20 +77,22 @@ describe PgSearch::Multisearchable do
 
           describe "saving the record" do
             it "calls save on the pg_search_document" do
-              expect(record.pg_search_document).to receive(:save)
+              allow(record.pg_search_document).to receive(:save)
               record.save!
+              expect(record.pg_search_document).to have_received(:save)
             end
 
-            it "should not create a PgSearch::Document record" do
+            it "does not create a PgSearch::Document record" do
               expect { record.save! }.not_to change(PgSearch::Document, :count)
             end
 
             context "with multisearch disabled" do
               before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-              it "should not create a PgSearch::Document record" do
-                expect(record.pg_search_document).not_to receive(:save)
+              it "does not create a PgSearch::Document record" do
+                allow(record.pg_search_document).to receive(:save)
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
+                expect(record.pg_search_document).not_to have_received(:save)
               end
             end
           end
@@ -99,14 +102,14 @@ describe PgSearch::Multisearchable do
           before { record.pg_search_document = nil }
 
           describe "saving the record" do
-            it "should create a PgSearch::Document record" do
+            it "creates a PgSearch::Document record" do
               expect { record.save! }.to change(PgSearch::Document, :count).by(1)
             end
 
             context "with multisearch disabled" do
               before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-              it "should not create a PgSearch::Document record" do
+              it "does not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -115,14 +118,14 @@ describe PgSearch::Multisearchable do
       end
 
       describe "after_destroy" do
-        it "should remove its document" do
+        it "removes its document" do
           record = ModelThatIsMultisearchable.create!
           document = record.pg_search_document
           expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
           expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
         end
 
-        it "should remove its document in case of complex associations" do
+        it "removes its document in case of complex associations" do
           parent = MultisearchableParent.create!
 
           MultisearchableChild.create!(multisearchable_parent: parent)
@@ -137,9 +140,10 @@ describe PgSearch::Multisearchable do
     end
 
     describe "populating the searchable text" do
-      let(:record) { ModelThatIsMultisearchable.new }
       subject { record }
 
+      let(:record) { ModelThatIsMultisearchable.new }
+
       before do
         ModelThatIsMultisearchable.multisearchable(multisearchable_options)
       end
@@ -147,36 +151,46 @@ describe PgSearch::Multisearchable do
       context "when searching against a single column" do
         let(:multisearchable_options) { { against: :some_content } }
         let(:text) { "foo bar" }
+
         before do
-          allow(record).to receive(:some_content) { text }
+          without_partial_double_verification do
+            allow(record).to receive(:some_content) { text }
+          end
           record.save
         end
 
         describe '#content' do
           subject { super().pg_search_document.content }
+
           it { is_expected.to eq(text) }
         end
       end
 
       context "when searching against multiple columns" do
         let(:multisearchable_options) { { against: %i[attr1 attr2] } }
+
         before do
-          allow(record).to receive(:attr1) { '1' }
-          allow(record).to receive(:attr2) { '2' }
+          without_partial_double_verification do
+            allow(record).to receive(:attr1).and_return('1')
+            allow(record).to receive(:attr2).and_return('2')
+          end
+
           record.save
         end
 
         describe '#content' do
           subject { super().pg_search_document.content }
+
           it { is_expected.to eq("1 2") }
         end
       end
     end
 
     describe "populating the searchable attributes" do
-      let(:record) { ModelThatIsMultisearchable.new }
       subject { record }
 
+      let(:record) { ModelThatIsMultisearchable.new }
+
       before do
         ModelThatIsMultisearchable.multisearchable(multisearchable_options)
       end
@@ -184,27 +198,35 @@ describe PgSearch::Multisearchable do
       context "when searching against a single column" do
         let(:multisearchable_options) { { against: :some_content } }
         let(:text) { "foo bar" }
+
         before do
-          allow(record).to receive(:some_content) { text }
+          without_partial_double_verification do
+            allow(record).to receive(:some_content) { text }
+          end
           record.save
         end
 
         describe '#content' do
           subject { super().pg_search_document.content }
+
           it { is_expected.to eq(text) }
         end
       end
 
       context "when searching against multiple columns" do
         let(:multisearchable_options) { { against: %i[attr1 attr2] } }
+
         before do
-          allow(record).to receive(:attr1) { '1' }
-          allow(record).to receive(:attr2) { '2' }
+          without_partial_double_verification do
+            allow(record).to receive(:attr1).and_return('1')
+            allow(record).to receive(:attr2).and_return('2')
+          end
           record.save
         end
 
         describe '#content' do
           subject { super().pg_search_document.content }
+
           it { is_expected.to eq("1 2") }
         end
       end
@@ -220,11 +242,14 @@ describe PgSearch::Multisearchable do
         let(:text) { "foo bar" }
 
         it "sets the attributes" do
-          allow(record).to receive(:bar).and_return(text)
-          expect(record)
-            .to receive(:create_pg_search_document)
-            .with(content: '', foo: text)
-          record.save
+          without_partial_double_verification do
+            allow(record).to receive(:bar).and_return(text)
+            allow(record).to receive(:create_pg_search_document)
+            record.save
+            expect(record)
+              .to have_received(:create_pg_search_document)
+              .with(content: '', foo: text)
+          end
         end
       end
 
@@ -239,39 +264,46 @@ describe PgSearch::Multisearchable do
         let(:text) { "foo bar" }
 
         it "creates the document" do
-          allow(record).to receive(:bar?).and_return(false)
-          expect(record)
-            .to receive(:create_pg_search_document)
-            .with(content: '')
-          record.save
+          without_partial_double_verification do
+            allow(record).to receive(:bar?).and_return(false)
+            allow(record).to receive(:create_pg_search_document)
+            record.save
+            expect(record)
+              .to have_received(:create_pg_search_document)
+              .with(content: '')
+          end
         end
 
-        context "the document is created" do
+        context "when the document is created" do
           before { record.save }
 
-          context "update_if returns false" do
+          context "when update_if returns false" do
             before do
-              allow(record).to receive(:bar?).and_return(false)
+              without_partial_double_verification do
+                allow(record).to receive(:bar?).and_return(false)
+              end
             end
 
             it "does not update the document" do
-              expect_any_instance_of(PgSearch::Document)
-                .to_not receive(:update)
-
-              record.save
+              without_partial_double_verification do
+                allow(record.pg_search_document).to receive(:update)
+                record.save
+                expect(record.pg_search_document).not_to have_received(:update)
+              end
             end
           end
 
-          context "update_if returns true" do
+          context "when update_if returns true" do
             before do
-              allow(record).to receive(:bar?).and_return(true)
+              without_partial_double_verification do
+                allow(record).to receive(:bar?).and_return(true)
+              end
             end
 
             it "updates the document" do
-              expect_any_instance_of(PgSearch::Document)
-                .to receive(:update)
-
+              allow(record.pg_search_document).to receive(:update)
               record.save
+              expect(record.pg_search_document).to have_received(:update)
             end
           end
         end
@@ -287,7 +319,7 @@ describe PgSearch::Multisearchable do
         end
 
         model do
-          include PgSearch
+          include PgSearch::Model
           multisearchable if: ->(record) { record.multisearchable? }
         end
       end
@@ -298,14 +330,14 @@ describe PgSearch::Multisearchable do
             context "when the condition is true" do
               let(:record) { ModelThatIsMultisearchable.new(multisearchable: true) }
 
-              it "should create a PgSearch::Document record" do
+              it "creates a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
               end
 
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -314,7 +346,7 @@ describe PgSearch::Multisearchable do
             context "when the condition is false" do
               let(:record) { ModelThatIsMultisearchable.new(multisearchable: false) }
 
-              it "should not create a PgSearch::Document record" do
+              it "does not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -330,11 +362,12 @@ describe PgSearch::Multisearchable do
             describe "saving the record" do
               context "when the condition is true" do
                 it "calls save on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:save)
+                  allow(record.pg_search_document).to receive(:save)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:save)
                 end
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -343,11 +376,12 @@ describe PgSearch::Multisearchable do
                 before { record.multisearchable = false }
 
                 it "calls destroy on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:destroy)
+                  allow(record.pg_search_document).to receive(:destroy)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:destroy)
                 end
 
-                it "should remove its document" do
+                it "removes its document" do
                   document = record.pg_search_document
                   expect { record.save! }.to change(PgSearch::Document, :count).by(-1)
                   expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -359,9 +393,10 @@ describe PgSearch::Multisearchable do
                   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)
+                it "does not create a PgSearch::Document record" do
+                  allow(record.pg_search_document).to receive(:save)
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
+                  expect(record.pg_search_document).not_to have_received(:save)
                 end
               end
             end
@@ -372,14 +407,14 @@ describe PgSearch::Multisearchable do
 
             describe "saving the record" do
               context "when the condition is true" do
-                it "should create a PgSearch::Document record" do
+                it "creates a PgSearch::Document record" do
                   expect { record.save! }.to change(PgSearch::Document, :count).by(1)
                 end
 
                 context "with multisearch disabled" do
                   before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
@@ -388,7 +423,7 @@ describe PgSearch::Multisearchable do
               context "when the condition is false" do
                 before { record.multisearchable = false }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -399,7 +434,7 @@ describe PgSearch::Multisearchable do
         describe "after_destroy" do
           let(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
-          it "should remove its document" do
+          it "removes its document" do
             document = record.pg_search_document
             expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
             expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -415,7 +450,7 @@ describe PgSearch::Multisearchable do
         end
 
         model do
-          include PgSearch
+          include PgSearch::Model
           multisearchable unless: ->(record) { record.not_multisearchable? }
         end
       end
@@ -426,14 +461,14 @@ describe PgSearch::Multisearchable do
             context "when the condition is false" do
               let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: false) }
 
-              it "should create a PgSearch::Document record" do
+              it "creates a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
               end
 
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -442,7 +477,7 @@ describe PgSearch::Multisearchable do
             context "when the condition is true" do
               let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: true) }
 
-              it "should not create a PgSearch::Document record" do
+              it "does not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -458,21 +493,26 @@ describe PgSearch::Multisearchable do
             describe "saving the record" do
               context "when the condition is false" do
                 it "calls save on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:save)
+                  allow(record.pg_search_document).to receive(:save)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:save)
                 end
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
 
                 context "with multisearch disabled" do
                   before do
                     allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
-                    expect(record.pg_search_document).not_to receive(:save)
+                    allow(record.pg_search_document).to receive(:save)
+                  end
+
+                  it "does not call save on the document" do
+                    expect(record.pg_search_document).not_to have_received(:save)
                   end
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
@@ -482,11 +522,12 @@ describe PgSearch::Multisearchable do
                 before { record.not_multisearchable = true }
 
                 it "calls destroy on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:destroy)
+                  allow(record.pg_search_document).to receive(:destroy)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:destroy)
                 end
 
-                it "should remove its document" do
+                it "removes its document" do
                   document = record.pg_search_document
                   expect { record.save! }.to change(PgSearch::Document, :count).by(-1)
                   expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -500,7 +541,7 @@ describe PgSearch::Multisearchable do
 
             describe "saving the record" do
               context "when the condition is false" do
-                it "should create a PgSearch::Document record" do
+                it "creates a PgSearch::Document record" do
                   expect { record.save! }.to change(PgSearch::Document, :count).by(1)
                 end
               end
@@ -508,7 +549,7 @@ describe PgSearch::Multisearchable do
               context "when the condition is true" do
                 before { record.not_multisearchable = true }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -516,7 +557,7 @@ describe PgSearch::Multisearchable do
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -525,7 +566,7 @@ describe PgSearch::Multisearchable do
         end
 
         describe "after_destroy" do
-          it "should remove its document" do
+          it "removes its document" do
             record = ModelThatIsMultisearchable.create!
             document = record.pg_search_document
             expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
@@ -544,7 +585,7 @@ describe PgSearch::Multisearchable do
         end
 
         model do
-          include PgSearch
+          include PgSearch::Model
           multisearchable if: :multisearchable?
         end
       end
@@ -555,14 +596,14 @@ describe PgSearch::Multisearchable do
             context "when the condition is true" do
               let(:record) { ModelThatIsMultisearchable.new(multisearchable: true) }
 
-              it "should create a PgSearch::Document record" do
+              it "creates a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
               end
 
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -571,7 +612,7 @@ describe PgSearch::Multisearchable do
             context "when the condition is false" do
               let(:record) { ModelThatIsMultisearchable.new(multisearchable: false) }
 
-              it "should not create a PgSearch::Document record" do
+              it "does not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -587,21 +628,26 @@ describe PgSearch::Multisearchable do
             describe "saving the record" do
               context "when the condition is true" do
                 it "calls save on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:save)
+                  allow(record.pg_search_document).to receive(:save)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:save)
                 end
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
 
                 context "with multisearch disabled" do
                   before do
                     allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
-                    expect(record.pg_search_document).not_to receive(:save)
+                    allow(record.pg_search_document).to receive(:save)
                   end
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not call save on the document" do
+                    expect(record.pg_search_document).not_to have_received(:save)
+                  end
+
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
@@ -611,11 +657,12 @@ describe PgSearch::Multisearchable do
                 before { record.multisearchable = false }
 
                 it "calls destroy on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:destroy)
+                  allow(record.pg_search_document).to receive(:destroy)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:destroy)
                 end
 
-                it "should remove its document" do
+                it "removes its document" do
                   document = record.pg_search_document
                   expect { record.save! }.to change(PgSearch::Document, :count).by(-1)
                   expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -632,7 +679,7 @@ describe PgSearch::Multisearchable do
                 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
+                  it "creates a PgSearch::Document record" do
                     expect { record.save! }.to change(PgSearch::Document, :count).by(1)
                   end
                 end
@@ -640,7 +687,7 @@ describe PgSearch::Multisearchable do
                 context "when the condition is false" do
                   before { record.multisearchable = false }
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
@@ -649,7 +696,7 @@ describe PgSearch::Multisearchable do
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -660,7 +707,7 @@ describe PgSearch::Multisearchable do
         describe "after_destroy" do
           let(:record) { ModelThatIsMultisearchable.create!(multisearchable: true) }
 
-          it "should remove its document" do
+          it "removes its document" do
             document = record.pg_search_document
             expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
             expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -676,7 +723,7 @@ describe PgSearch::Multisearchable do
         end
 
         model do
-          include PgSearch
+          include PgSearch::Model
           multisearchable unless: :not_multisearchable?
         end
       end
@@ -687,7 +734,7 @@ describe PgSearch::Multisearchable do
             context "when the condition is true" do
               let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: true) }
 
-              it "should not create a PgSearch::Document record" do
+              it "does not create a PgSearch::Document record" do
                 expect { record.save! }.not_to change(PgSearch::Document, :count)
               end
             end
@@ -695,14 +742,14 @@ describe PgSearch::Multisearchable do
             context "when the condition is false" do
               let(:record) { ModelThatIsMultisearchable.new(not_multisearchable: false) }
 
-              it "should create a PgSearch::Document record" do
+              it "creates a PgSearch::Document record" do
                 expect { record.save! }.to change(PgSearch::Document, :count).by(1)
               end
 
               context "with multisearch disabled" do
                 before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
               end
@@ -721,11 +768,12 @@ describe PgSearch::Multisearchable do
                 before { record.not_multisearchable = true }
 
                 it "calls destroy on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:destroy)
+                  allow(record.pg_search_document).to receive(:destroy)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:destroy)
                 end
 
-                it "should remove its document" do
+                it "removes its document" do
                   document = record.pg_search_document
                   expect { record.save! }.to change(PgSearch::Document, :count).by(-1)
                   expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -734,21 +782,26 @@ describe PgSearch::Multisearchable do
 
               context "when the condition is false" do
                 it "calls save on the pg_search_document" do
-                  expect(record.pg_search_document).to receive(:save)
+                  allow(record.pg_search_document).to receive(:save)
                   record.save!
+                  expect(record.pg_search_document).to have_received(:save)
                 end
 
-                it "should not create a PgSearch::Document record" do
+                it "does not create a PgSearch::Document record" do
                   expect { record.save! }.not_to change(PgSearch::Document, :count)
                 end
 
                 context "with multisearch disabled" do
                   before do
                     allow(PgSearch).to receive(:multisearch_enabled?).and_return(false)
-                    expect(record.pg_search_document).not_to receive(:save)
+                    allow(record.pg_search_document).to receive(:save)
+                  end
+
+                  it "does not call save on the document" do
+                    expect(record.pg_search_document).not_to have_received(:save)
                   end
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
@@ -766,20 +819,20 @@ describe PgSearch::Multisearchable do
                 context "when the condition is true" do
                   before { record.not_multisearchable = true }
 
-                  it "should not create a PgSearch::Document record" do
+                  it "does not create a PgSearch::Document record" do
                     expect { record.save! }.not_to change(PgSearch::Document, :count)
                   end
                 end
 
                 context "when the condition is false" do
-                  it "should create a PgSearch::Document record" do
+                  it "creates a PgSearch::Document record" do
                     expect { record.save! }.to change(PgSearch::Document, :count).by(1)
                   end
 
                   context "with multisearch disabled" do
                     before { allow(PgSearch).to receive(:multisearch_enabled?).and_return(false) }
 
-                    it "should not create a PgSearch::Document record" do
+                    it "does not create a PgSearch::Document record" do
                       expect { record.save! }.not_to change(PgSearch::Document, :count)
                     end
                   end
@@ -792,7 +845,7 @@ describe PgSearch::Multisearchable do
         describe "after_destroy" do
           let(:record) { ModelThatIsMultisearchable.create!(not_multisearchable: false) }
 
-          it "should remove its document" do
+          it "removes its document" do
             document = record.pg_search_document
             expect { record.destroy }.to change(PgSearch::Document, :count).by(-1)
             expect { PgSearch::Document.find(document.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -802,3 +855,4 @@ describe PgSearch::Multisearchable do
     end
   end
 end
+# rubocop:enable RSpec/NestedGroups