pg_search 2.3.6 → 2.3.8

data/spec/integration/single_table_inheritance_spec.rb

@@ -6,12 +6,13 @@ describe "a pg_search_scope on an STI subclass" do
   context "with the standard type column" do
     with_model :SuperclassModel do
       table do |t|
-        t.text 'content'
-        t.string 'type'
+        t.text "content"
+        t.string "type"
       end
 
       model do
         include PgSearch::Model
+
         pg_search_scope :search_content, against: :content
       end
     end
@@ -46,13 +47,14 @@ describe "a pg_search_scope on an STI subclass" do
   context "with a custom type column" do
     with_model :SuperclassModel do
       table do |t|
-        t.text 'content'
-        t.string 'custom_type'
+        t.text "content"
+        t.string "custom_type"
       end
 
       model do
         include PgSearch::Model
-        self.inheritance_column = 'custom_type'
+
+        self.inheritance_column = "custom_type"
         pg_search_scope :search_content, against: :content
       end
     end

data/spec/lib/pg_search/configuration/association_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-# rubocop:disable RSpec/NestedGroups
+# standard:disable RSpec/NestedGroups
 describe PgSearch::Configuration::Association do
   with_model :Avatar do
     table do |t|
@@ -19,11 +19,12 @@ describe PgSearch::Configuration::Association do
 
     model do
       include PgSearch::Model
+
       has_one :avatar, class_name: "Avatar"
       belongs_to :site
 
-      pg_search_scope :with_avatar, associated_against: { avatar: :url }
-      pg_search_scope :with_site, associated_against: { site: :title }
+      pg_search_scope :with_avatar, associated_against: {avatar: :url}
+      pg_search_scope :with_site, associated_against: {site: :title}
     end
   end
 
@@ -34,9 +35,10 @@ describe PgSearch::Configuration::Association do
 
     model do
       include PgSearch::Model
+
       has_many :users, class_name: "User"
 
-      pg_search_scope :with_users, associated_against: { users: :name }
+      pg_search_scope :with_users, associated_against: {users: :name}
     end
   end
 
@@ -55,9 +57,9 @@ describe PgSearch::Configuration::Association do
           LEFT OUTER JOIN
             (SELECT model_id AS id,
                     #{column_select} AS #{association.columns.first.alias}
-            FROM \"#{User.table_name}\"
-            INNER JOIN \"#{association.table_name}\"
-            ON \"#{association.table_name}\".\"user_id\" = \"#{User.table_name}\".\"id\") #{association.subselect_alias}
+            FROM "#{User.table_name}"
+            INNER JOIN "#{association.table_name}"
+            ON "#{association.table_name}"."user_id" = "#{User.table_name}"."id") #{association.subselect_alias}
           ON #{association.subselect_alias}.id = model_id
         SQL
       end
@@ -86,9 +88,9 @@ describe PgSearch::Configuration::Association do
           LEFT OUTER JOIN
             (SELECT model_id AS id,
                     #{column_select} AS #{association.columns.first.alias}
-            FROM \"#{User.table_name}\"
-            INNER JOIN \"#{association.table_name}\"
-            ON \"#{association.table_name}\".\"id\" = \"#{User.table_name}\".\"site_id\") #{association.subselect_alias}
+            FROM "#{User.table_name}"
+            INNER JOIN "#{association.table_name}"
+            ON "#{association.table_name}"."id" = "#{User.table_name}"."site_id") #{association.subselect_alias}
           ON #{association.subselect_alias}.id = model_id
         SQL
       end
@@ -116,10 +118,10 @@ describe PgSearch::Configuration::Association do
         <<~SQL.squish
           LEFT OUTER JOIN
             (SELECT model_id AS id,
-                    string_agg(\"#{association.table_name}\".\"name\"::text, ' ') AS #{association.columns.first.alias}
-            FROM \"#{Site.table_name}\"
-            INNER JOIN \"#{association.table_name}\"
-            ON \"#{association.table_name}\".\"site_id\" = \"#{Site.table_name}\".\"id\"
+                    string_agg("#{association.table_name}"."name"::text, ' ') AS #{association.columns.first.alias}
+            FROM "#{Site.table_name}"
+            INNER JOIN "#{association.table_name}"
+            ON "#{association.table_name}"."site_id" = "#{Site.table_name}"."id"
             GROUP BY model_id) #{association.subselect_alias}
           ON #{association.subselect_alias}.id = model_id
         SQL
@@ -139,4 +141,4 @@ describe PgSearch::Configuration::Association do
     end
   end
 end
-# rubocop:enable RSpec/NestedGroups
+# standard:enable RSpec/NestedGroups

data/spec/lib/pg_search/configuration/column_spec.rb

@@ -7,6 +7,7 @@ describe PgSearch::Configuration::Column do
     with_model :Model do
       table do |t|
         t.string :name
+        t.json :object
       end
     end
 
@@ -14,18 +15,29 @@ describe PgSearch::Configuration::Column do
       column = described_class.new("name", nil, Model)
       expect(column.full_name).to eq(%(#{Model.quoted_table_name}."name"))
     end
+
+    it "returns nested json attributes" do
+      column = described_class.new(Arel.sql("object->>'name'"), nil, Model)
+      expect(column.full_name).to eq(%(object->>'name'))
+    end
   end
 
   describe "#to_sql" do
     with_model :Model do
       table do |t|
         t.string :name
+        t.json :object
       end
     end
 
     it "returns an expression that casts the column to text and coalesces it with an empty string" do
       column = described_class.new("name", nil, Model)
-      expect(column.to_sql).to eq(%{coalesce(#{Model.quoted_table_name}."name"::text, '')})
+      expect(column.to_sql).to eq(%{coalesce((#{Model.quoted_table_name}."name")::text, '')})
+    end
+
+    it "returns an expression that casts the nested json attribute to text and coalesces it with an empty string" do
+      column = described_class.new(Arel.sql("object->>'name'"), nil, Model)
+      expect(column.to_sql).to eq(%{coalesce((object->>'name')::text, '')})
     end
   end
 end

data/spec/lib/pg_search/configuration/foreign_column_spec.rb

@@ -18,16 +18,17 @@ describe PgSearch::Configuration::ForeignColumn do
 
       model do
         include PgSearch::Model
-        belongs_to :another_model, class_name: 'AssociatedModel'
 
-        pg_search_scope :with_another, associated_against: { another_model: :title }
+        belongs_to :another_model, class_name: "AssociatedModel"
+
+        pg_search_scope :with_another, associated_against: {another_model: :title}
       end
     end
 
     it "returns a consistent string" do
       association = PgSearch::Configuration::Association.new(Model,
-                                                             :another_model,
-                                                             :title)
+        :another_model,
+        :title)
       foreign_column = described_class.new("title", nil, Model, association)
 
       column_alias = foreign_column.alias

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

@@ -18,12 +18,12 @@ describe PgSearch::Features::DMetaphone do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = instance_double("PgSearch::Configuration", :config, ignore: [])
+      config = instance_double(PgSearch::Configuration, :config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %{(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))}
+        %{(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
@@ -43,12 +43,12 @@ describe PgSearch::Features::DMetaphone do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = instance_double("PgSearch::Configuration", :config, ignore: [])
+      config = instance_double(PgSearch::Configuration, :config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %{((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') || ' ''')))}
+        %{((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

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

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'ostruct'
+require "spec_helper"
 
-# rubocop:disable RSpec/MultipleMemoizedHelpers, RSpec/NestedGroups
+# standard:disable RSpec/MultipleMemoizedHelpers, RSpec/NestedGroups
 describe PgSearch::Features::Trigram do
   subject(:feature) { described_class.new(query, options, columns, Model, normalizer) }
 
-  let(:query) { 'lolwut' }
+  let(:query) { "lolwut" }
   let(:options) { {} }
   let(:columns) {
     [
@@ -16,13 +15,14 @@ describe PgSearch::Features::Trigram do
     ]
   }
   let(:normalizer) { PgSearch::Normalizer.new(config) }
-  let(:config) { OpenStruct.new(ignore: []) } # rubocop:disable Style/OpenStructUse
+  let(:config) { instance_double(PgSearch::Configuration, ignore: ignore) }
+  let(:ignore) { [] }
 
   let(:coalesced_columns) do
     <<~SQL.squish
-      coalesce(#{Model.quoted_table_name}."name"::text, '')
+      coalesce((#{Model.quoted_table_name}."name")::text, '')
         || ' '
-        || coalesce(#{Model.quoted_table_name}."content"::text, '')
+        || coalesce((#{Model.quoted_table_name}."content")::text, '')
     SQL
   end
 
@@ -33,34 +33,33 @@ describe PgSearch::Features::Trigram do
     end
   end
 
-  describe 'conditions' do
-    it 'escapes the search document and query' do
-      config.ignore = []
+  describe "conditions" do
+    it "escapes the search document and query" do
       expect(feature.conditions.to_sql).to eq("('#{query}' % (#{coalesced_columns}))")
     end
 
-    context 'when searching by word_similarity' do
+    context "when searching by word_similarity" do
       let(:options) do
-        { word_similarity: true }
+        {word_similarity: true}
       end
 
       it 'uses the "<%" operator when searching by word_similarity' do
-        config.ignore = []
         expect(feature.conditions.to_sql).to eq("('#{query}' <% (#{coalesced_columns}))")
       end
     end
 
-    context 'when ignoring accents' do
-      it 'escapes the search document and query, but not the accent function' do
-        config.ignore = [:accents]
-        expect(feature.conditions.to_sql).to eq("(unaccent('#{query}') % (unaccent(#{coalesced_columns})))")
+    context "when ignoring accents" do
+      let(:ignore) { [:accents] }
+
+      it "escapes the search document and query, but not the accent function" do
+        expect(feature.conditions.to_sql).to eq("(regexp_replace(unaccent('#{query}'), '[''?\\:]', '', 'g') % (regexp_replace(unaccent(#{coalesced_columns}), '[''?\\:]', '', 'g')))")
       end
     end
 
-    context 'when a threshold is specified' do
-      context 'when searching by similarity' do
+    context "when a threshold is specified" do
+      context "when searching by similarity" do
         let(:options) do
-          { threshold: 0.5 }
+          {threshold: 0.5}
         end
 
         it 'uses a minimum similarity expression instead of the "%" operator' do
@@ -70,9 +69,9 @@ describe PgSearch::Features::Trigram do
         end
       end
 
-      context 'when searching by word_similarity' do
+      context "when searching by word_similarity" do
         let(:options) do
-          { threshold: 0.5, word_similarity: true }
+          {threshold: 0.5, word_similarity: true}
         end
 
         it 'uses a minimum similarity expression instead of the "<%" operator' do
@@ -83,30 +82,30 @@ describe PgSearch::Features::Trigram do
       end
     end
 
-    context 'when only certain columns are selected' do
-      context 'with one column' do
-        let(:options) { { only: :name } }
+    context "when only certain columns are selected" do
+      context "with one column" do
+        let(:options) { {only: :name} }
 
-        it 'only searches against the select column' do
-          coalesced_column = "coalesce(#{Model.quoted_table_name}.\"name\"::text, '')"
+        it "only searches against the select column" do
+          coalesced_column = "coalesce((#{Model.quoted_table_name}.\"name\")::text, '')"
           expect(feature.conditions.to_sql).to eq("('#{query}' % (#{coalesced_column}))")
         end
       end
 
-      context 'with multiple columns' do
-        let(:options) { { only: %i[name content] } }
+      context "with multiple columns" do
+        let(:options) { {only: %i[name content]} }
 
-        it 'concatenates when multiples columns are selected' do
+        it "concatenates when multiples columns are selected" do
           expect(feature.conditions.to_sql).to eq("('#{query}' % (#{coalesced_columns}))")
         end
       end
     end
   end
 
-  describe '#rank' do
-    it 'returns an expression using the similarity() function' do
+  describe "#rank" do
+    it "returns an expression using the similarity() function" do
       expect(feature.rank.to_sql).to eq("(similarity('#{query}', (#{coalesced_columns})))")
     end
   end
 end
-# rubocop:enable RSpec/MultipleMemoizedHelpers, RSpec/NestedGroups
+# standard:enable RSpec/MultipleMemoizedHelpers, RSpec/NestedGroups

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require "active_support/deprecation"
+require "active_support/core_ext/kernel/reporting"
 
 describe PgSearch::Features::TSearch do
   describe "#rank" do
@@ -19,14 +19,32 @@ describe PgSearch::Features::TSearch do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = instance_double("PgSearch::Configuration", :config, ignore: [])
+      config = instance_double(PgSearch::Configuration, :config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.rank.to_sql).to eq(
-        %{(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))}
+        %{(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
+
+    context "with a tsvector column and a custom normalization" do
+      it "works?" do
+        query = "query"
+        columns = [
+          PgSearch::Configuration::Column.new(:name, nil, Model),
+          PgSearch::Configuration::Column.new(:content, nil, Model)
+        ]
+        options = {tsvector_column: :my_tsvector, normalization: 2}
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
+        normalizer = PgSearch::Normalizer.new(config)
+
+        feature = described_class.new(query, options, columns, Model, normalizer)
+        expect(feature.rank.to_sql).to eq(
+          %{(ts_rank((#{Model.quoted_table_name}."my_tsvector"), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 2))}
+        )
+      end
+    end
   end
 
   describe "#conditions" do
@@ -44,12 +62,12 @@ describe PgSearch::Features::TSearch do
         PgSearch::Configuration::Column.new(:content, nil, Model)
       ]
       options = {}
-      config = instance_double("PgSearch::Configuration", :config, ignore: [])
+      config = instance_double(PgSearch::Configuration, :config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.conditions.to_sql).to eq(
-        %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+        %{((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
 
@@ -60,13 +78,13 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { negation: true }
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        options = {negation: true}
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', '!' || ''' ' || 'query' || ' ''')))}
+          %{((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
@@ -78,49 +96,49 @@ describe PgSearch::Features::TSearch do
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { negation: false }
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        options = {negation: false}
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((to_tsvector('simple', coalesce(#{Model.quoted_table_name}."name"::text, '')) || to_tsvector('simple', coalesce(#{Model.quoted_table_name}."content"::text, ''))) @@ (to_tsquery('simple', ''' ' || '!query' || ' ''')))}
+          %{((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
 
     context "when options[:tsvector_column] is a string" do
-      it 'uses the tsvector column' do
+      it "uses the tsvector column" do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { tsvector_column: "my_tsvector" }
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        options = {tsvector_column: "my_tsvector"}
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((#{Model.quoted_table_name}.\"my_tsvector\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+          %{((#{Model.quoted_table_name}."my_tsvector") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
         )
       end
     end
 
     context "when options[:tsvector_column] is an array of strings" do
-      it 'uses the tsvector column' do
+      it "uses the tsvector column" do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
           PgSearch::Configuration::Column.new(:content, nil, Model)
         ]
-        options = { tsvector_column: ["tsvector1", "tsvector2"] }
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        options = {tsvector_column: ["tsvector1", "tsvector2"]}
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
         expect(feature.conditions.to_sql).to eq(
-          %{((#{Model.quoted_table_name}.\"tsvector1\" || #{Model.quoted_table_name}.\"tsvector2\") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
+          %{((#{Model.quoted_table_name}."tsvector1" || #{Model.quoted_table_name}."tsvector2") @@ (to_tsquery('simple', ''' ' || 'query' || ' ''')))}
         )
       end
     end
@@ -141,18 +159,18 @@ describe PgSearch::Features::TSearch do
       ]
       options = {}
 
-      config = instance_double("PgSearch::Configuration", :config, ignore: [])
+      config = instance_double(PgSearch::Configuration, :config, ignore: [])
       normalizer = PgSearch::Normalizer.new(config)
 
       feature = described_class.new(query, options, columns, Model, normalizer)
       expect(feature.highlight.to_sql).to eq(
-        "(ts_headline('simple', (coalesce(#{Model.quoted_table_name}.\"name\"::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), ''))"
+        "(ts_headline('simple', (coalesce((#{Model.quoted_table_name}.\"name\")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), ''))"
       )
     end
 
     context "when options[:dictionary] is passed" do
-      # rubocop:disable RSpec/ExampleLength
-      it 'uses the provided dictionary' do
+      # standard:disable RSpec/ExampleLength
+      it "uses the provided dictionary" do
         query = "query"
         columns = [
           PgSearch::Configuration::Column.new(:name, nil, Model),
@@ -166,20 +184,20 @@ describe PgSearch::Features::TSearch do
           }
         }
 
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
 
-        expected_sql = %{(ts_headline('spanish', (coalesce(#{Model.quoted_table_name}."name"::text, '') || ' ' || coalesce(#{Model.quoted_table_name}."content"::text, '')), (to_tsquery('spanish', ''' ' || 'query' || ' ''')), 'StartSel = "<b>", StopSel = "</b>"'))}
+        expected_sql = %{(ts_headline('spanish', (coalesce((#{Model.quoted_table_name}."name")::text, '') || ' ' || coalesce((#{Model.quoted_table_name}."content")::text, '')), (to_tsquery('spanish', ''' ' || 'query' || ' ''')), 'StartSel = "<b>", StopSel = "</b>"'))}
 
         expect(feature.highlight.to_sql).to eq(expected_sql)
       end
-      # rubocop:enable RSpec/ExampleLength
+      # standard:enable RSpec/ExampleLength
     end
 
     context "when options[:highlight] has options set" do
-      # rubocop:disable RSpec/ExampleLength
+      # standard:disable RSpec/ExampleLength
       it "passes the options to ts_headline" do
         query = "query"
         columns = [
@@ -188,28 +206,28 @@ describe PgSearch::Features::TSearch do
         options = {
           highlight: {
             StartSel: '<start class="search">',
-            StopSel: '<stop>',
+            StopSel: "<stop>",
             MaxWords: 123,
             MinWords: 456,
             ShortWord: 4,
             HighlightAll: true,
             MaxFragments: 3,
-            FragmentDelimiter: '&hellip;'
+            FragmentDelimiter: "&hellip;"
           }
         }
 
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
 
-        expected_sql = %{(ts_headline('simple', (coalesce(#{Model.quoted_table_name}."name"::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = TRUE'))}
+        expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = TRUE'))}
 
         expect(feature.highlight.to_sql).to eq(expected_sql)
       end
-      # rubocop:enable RSpec/ExampleLength
+      # standard:enable RSpec/ExampleLength
 
-      # rubocop:disable RSpec/ExampleLength
+      # standard:disable RSpec/ExampleLength
       it "passes deprecated options to ts_headline" do
         query = "query"
         columns = [
@@ -218,27 +236,27 @@ describe PgSearch::Features::TSearch do
         options = {
           highlight: {
             start_sel: '<start class="search">',
-            stop_sel: '<stop>',
+            stop_sel: "<stop>",
             max_words: 123,
             min_words: 456,
             short_word: 4,
             highlight_all: false,
             max_fragments: 3,
-            fragment_delimiter: '&hellip;'
+            fragment_delimiter: "&hellip;"
           }
         }
 
-        config = instance_double("PgSearch::Configuration", :config, ignore: [])
+        config = instance_double(PgSearch::Configuration, :config, ignore: [])
         normalizer = PgSearch::Normalizer.new(config)
 
         feature = described_class.new(query, options, columns, Model, normalizer)
 
-        highlight_sql = ActiveSupport::Deprecation.silence { feature.highlight.to_sql }
-        expected_sql = %{(ts_headline('simple', (coalesce(#{Model.quoted_table_name}."name"::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = FALSE'))}
+        highlight_sql = silence_warnings { feature.highlight.to_sql }
+        expected_sql = %{(ts_headline('simple', (coalesce((#{Model.quoted_table_name}."name")::text, '')), (to_tsquery('simple', ''' ' || 'query' || ' ''')), 'StartSel = "<start class=""search"">", StopSel = "<stop>", MaxFragments = 3, MaxWords = 123, MinWords = 456, ShortWord = 4, FragmentDelimiter = "&hellip;", HighlightAll = FALSE'))}
 
         expect(highlight_sql).to eq(expected_sql)
       end
-      # rubocop:enable RSpec/ExampleLength
+      # standard:enable RSpec/ExampleLength
     end
   end
 end