ransack 1.8.4 → 3.2.1

data/spec/ransack/helpers/form_helper_spec.rb

@@ -25,20 +25,12 @@ module Ransack
       describe '#sort_link with default search_key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=name\+asc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=name\+asc/
-            end
-          )
-        }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=name\+asc/ }
         it { should match /sort_link desc/ }
         it { should match /Full Name ▼/ }
       end
@@ -46,75 +38,43 @@ module Ransack
       describe '#sort_url with default search_key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=name\+asc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=name\+asc/
-            end
-          )
-        }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=name\+asc/ }
       end
 
       describe '#sort_link with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?people_search%5Bs%5D=name\+asc/
-            else
-              /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
-            end
-          )
-        }
+        it { should match /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/ }
       end
 
       describe '#sort_url with default search_key defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: ['name desc'] }, search_key: :people_search),
+            Person.ransack({ sorts: ['name desc'] }, search_key: :people_search),
             :name, controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?people_search%5Bs%5D=name\+asc/
-            else
-              /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
-            end
-          )
-        }
+        it { should match /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/ }
       end
 
       describe '#sort_link desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=comments.body\+desc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=comments.body\+desc/
-            end
-            )
-          }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=comments.body\+desc/ }
         it { should match /sort_link asc/ }
         it { should match /Body ▲/ }
       end
@@ -122,39 +82,23 @@ module Ransack
       describe '#sort_url desc through association table defined as symbol' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments_body asc' }),
+            Person.ransack({ sorts: 'comments_body asc' }),
             :comments_body,
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=comments.body\+desc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=comments.body\+desc/
-            end
-          )
-        }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=comments.body\+desc/ }
       end
 
       describe '#sort_link through association table defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=comments.body\+asc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=comments.body\+asc/
-            end
-            )
-          }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=comments.body\+asc/ }
         it { should match /sort_link desc/ }
         it { should match /Comments.body ▼/ }
       end
@@ -162,20 +106,12 @@ module Ransack
       describe '#sort_url through association table defined as a string' do
         subject { @controller.view_context
           .sort_url(
-            Person.search({ sorts: 'comments.body desc' }),
+            Person.ransack({ sorts: 'comments.body desc' }),
             'comments.body',
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?q%5Bs%5D=comments.body\+asc/
-            else
-              /people\?q(%5B|\[)s(%5D|\])=comments.body\+asc/
-            end
-          )
-        }
+        it { should match /people\?q(%5B|\[)s(%5D|\])=comments.body\+asc/ }
       end
 
       describe '#sort_link works even if search params are a blank string' do
@@ -183,7 +119,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_link(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -196,7 +132,7 @@ module Ransack
         specify {
           expect { @controller.view_context
             .sort_url(
-              Person.search(@controller.view_context.params[:q]),
+              Person.ransack(@controller.view_context.params[:q]),
               :name,
               controller: 'people'
             )
@@ -207,28 +143,20 @@ module Ransack
       describe '#sort_link with search_key defined as a string' do
         subject { @controller.view_context
           .sort_link(
-            Person.search(
+            Person.ransack(
               { sorts: ['name desc'] }, search_key: 'people_search'
             ),
             :name,
             controller: 'people'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /people\?people_search%5Bs%5D=name\+asc/
-            else
-              /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
-            end
-          )
-        }
+        it { should match /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/ }
       end
 
       describe '#sort_link with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -240,7 +168,7 @@ module Ransack
       describe '#sort_url with default_order defined with a string key' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name,
             controller: 'people',
             default_order: 'desc'
@@ -252,13 +180,13 @@ module Ransack
       describe '#sort_link with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
         }
         it {
-          should match(            /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link desc/ }
@@ -268,13 +196,13 @@ module Ransack
       describe '#sort_url with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             controller: 'people'
           )
         }
         it {
-          should match( /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -282,13 +210,13 @@ module Ransack
       describe '#sort_link with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
         }
         it {
-          should match(         /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link desc/ }
@@ -298,13 +226,13 @@ module Ransack
       describe '#sort_url with multiple search_keys does not break on nil values & ignores them' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', nil, 'email', nil])],
+            [:main_app, Person.ransack(sorts: ['name desc', nil, 'email', nil])],
             :name, [nil, :name, nil, 'email DESC', nil],
             controller: 'people'
           )
         }
         it {
-          should match(                     /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -312,7 +240,7 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow a label to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, 'email DESC'],
             'Property Name',
             controller: 'people'
@@ -324,13 +252,13 @@ module Ransack
       describe '#sort_link with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
         }
         it {
-          should match(          /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link desc/ }
@@ -340,13 +268,13 @@ module Ransack
       describe '#sort_url with multiple search_keys should flip multiple fields specified without a direction' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search(sorts: ['name desc', 'email asc'])],
+            [:main_app, Person.ransack(sorts: ['name desc', 'email asc'])],
             :name, [:name, :email],
             controller: 'people'
           )
         }
         it {
-          should match(                /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -354,14 +282,14 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
           )
         }
         it {
-          should match(            /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link/ }
@@ -371,14 +299,14 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: 'desc'
           )
         }
         it {
-          should match(                     /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -386,14 +314,14 @@ module Ransack
       describe '#sort_link with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack()],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
           )
         }
         it {
-          should match(            /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link/ }
@@ -403,14 +331,14 @@ module Ransack
       describe '#sort_url with multiple search_keys and default_order specified as a symbol' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: :desc
           )
         }
         it {
-          should match(                     /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -418,14 +346,14 @@ module Ransack
       describe '#sort_link with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
           )
         }
         it {
-          should match(      /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+asc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+asc/
           )
         }
         it { should match /sort_link/ }
@@ -435,14 +363,14 @@ module Ransack
       describe '#sort_url with multiple search_keys should allow multiple default_orders to be specified' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, :email],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
           )
         }
         it {
-          should match(                     /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+asc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+asc/
           )
         }
       end
@@ -450,14 +378,14 @@ module Ransack
       describe '#sort_link with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
           )
         }
         it {
-          should match(  /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
         it { should match /sort_link/ }
@@ -467,14 +395,14 @@ module Ransack
       describe '#sort_url with multiple search_keys with multiple default_orders should not override a specified order' do
         subject { @controller.view_context
           .sort_url(
-            [:main_app, Person.search()],
+            [:main_app, Person.ransack],
             :name, [:name, 'email desc'],
             controller: 'people',
             default_order: { name: 'desc', email: 'asc' }
           )
         }
         it {
-          should match(        /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          should match(/people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
       end
@@ -482,20 +410,12 @@ module Ransack
       describe "#sort_link on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /notes\?q%5Bs%5D=notable_of_Person_type_name\+asc/
-            else
-              /notes\?q(%5B|\[)s(%5D|\])=notable_of_Person_type_name\+asc/
-            end
-          )
-        }
+        it { should match /notes\?q(%5B|\[)s(%5D|\])=notable_of_Person_type_name\+asc/ }
         it { should match /sort_link/ }
         it { should match /Notable/ }
       end
@@ -503,20 +423,12 @@ module Ransack
       describe "#sort_url on polymorphic association should preserve association model name case" do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Note.search()],
+            [:main_app, Note.ransack],
             :notable_of_Person_type_name, "Notable",
             controller: 'notes'
           )
         }
-        it {
-          should match(
-            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-              /notes\?q%5Bs%5D=notable_of_Person_type_name\+asc/
-            else
-              /notes\?q(%5B|\[)s(%5D|\])=notable_of_Person_type_name\+asc/
-            end
-          )
-        }
+        it { should match /notes\?q(%5B|\[)s(%5D|\])=notable_of_Person_type_name\+asc/ }
       end
 
       context 'view has existing parameters' do
@@ -527,7 +439,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_link(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -545,7 +457,7 @@ module Ransack
 
           subject {
             @controller.view_context.sort_url(
-              Person.search(
+              Person.ransack(
                 { sorts: ['name desc'] },
                 search_key: 'people_search'
               ),
@@ -557,11 +469,10 @@ module Ransack
           it { should match /exist\=existing/ }
         end
 
-        context 'using a real ActionController::Parameter object',
-          if: ::ActiveRecord::VERSION::MAJOR > 3 do
+        context 'using a real ActionController::Parameter object' do
 
           describe 'with symbol q:, #sort_link should include search params' do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -576,7 +487,7 @@ module Ransack
           end
 
           describe 'with symbol q:, #sort_url should include search params' do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) { ActionController::Parameters.new(
               { :q => { name_eq: 'TEST' }, controller: 'people' }
               ) }
@@ -591,7 +502,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_link should include search params" do
-            subject { @controller.view_context.sort_link(Person.search, :name) }
+            subject { @controller.view_context.sort_link(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -607,7 +518,7 @@ module Ransack
           end
 
           describe "with string 'q', #sort_url should include search params" do
-            subject { @controller.view_context.sort_url(Person.search, :name) }
+            subject { @controller.view_context.sort_url(Person.ransack, :name) }
             let(:params) {
               ActionController::Parameters.new(
                 { 'q' => { name_eq: 'Test2' }, controller: 'people' }
@@ -627,7 +538,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to true' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: true
@@ -640,7 +551,7 @@ module Ransack
       describe '#sort_link with hide order indicator set to false' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -660,7 +571,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -681,7 +592,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name asc'])],
+            [:main_app, Person.ransack(sorts: ['name asc'])],
             :name,
             controller: 'people',
             hide_indicator: false
@@ -702,7 +613,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -718,7 +629,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -731,19 +642,19 @@ module Ransack
         before do
           Ransack.configure do |c|
             c.hide_sort_order_indicators = false
-            c.custom_arrows = { default_arrow: "defaultarrow"}
+            c.custom_arrows = { default_arrow: "defaultarrow" }
           end
         end
 
         after do
           Ransack.configure do |c|
-            c.custom_arrows = { default_arrow: nil}
+            c.custom_arrows = { default_arrow: nil }
           end
         end
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search],
+            [:main_app, Person.ransack],
             :name,
             controller: 'people'
           )
@@ -769,7 +680,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -795,7 +706,7 @@ module Ransack
 
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           )
@@ -807,7 +718,7 @@ module Ransack
       describe '#sort_link with a block' do
         subject { @controller.view_context
           .sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+            [:main_app, Person.ransack(sorts: ['name desc'])],
             :name,
             controller: 'people'
           ) { 'Block label' }
@@ -815,16 +726,72 @@ module Ransack
         it { should match /Block label ▼/ }
       end
 
+      describe '#sort_link with class option' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.ransack(sorts: ['name desc'])],
+            :name,
+            class: 'people', controller: 'people'
+          )
+        }
+        it { should match /class="sort_link desc people"/ }
+        it { should_not match /people\?class=people/ }
+      end
+
+      describe '#sort_link with class option workaround' do
+        it "generates a correct link and prints a deprecation" do
+          expect do
+            link = @controller.view_context
+              .sort_link(
+                [:main_app, Person.ransack(sorts: ['name desc'])],
+                :name,
+                'name',
+                { controller: 'people' },
+                class: 'people'
+              )
+
+            expect(link).to match(/class="sort_link desc people"/)
+            expect(link).not_to match(/people\?class=people/)
+          end.to output(
+            /Passing two trailing hashes to `sort_link` is deprecated, merge the trailing hashes into a single one\. \(called at #{Regexp.escape(__FILE__)}:/
+          ).to_stderr
+        end
+      end
+
+      describe '#sort_link with data option' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.ransack(sorts: ['name desc'])],
+            :name,
+            data: { turbo_action: :advance }, controller: 'people'
+          )
+        }
+        it { should match /data-turbo-action="advance"/ }
+        it { should_not match /people\?data%5Bturbo_action%5D=advance/ }
+      end
+
+      describe "#sort_link with host option" do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.ransack(sorts: ['name desc'])],
+            :name,
+            host: 'foo', controller: 'people'
+          )
+        }
+        it { should match /href="\/people\?q/ }
+        it { should_not match /href=".*foo/ }
+      end
+
       describe '#search_form_for with default format' do
         subject { @controller.view_context
-          .search_form_for(Person.search) {} }
+          .search_form_for(Person.ransack) {} }
         it { should match /action="\/people"/ }
       end
 
       describe '#search_form_for with pdf format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :pdf) {}
+          .search_form_for(Person.ransack, format: :pdf) {}
         }
         it { should match /action="\/people.pdf"/ }
       end
@@ -832,7 +799,7 @@ module Ransack
       describe '#search_form_for with json format' do
         subject {
           @controller.view_context
-          .search_form_for(Person.search, format: :json) {}
+          .search_form_for(Person.ransack, format: :json) {}
         }
         it { should match /action="\/people.json"/ }
       end
@@ -840,7 +807,7 @@ module Ransack
       describe '#search_form_for with an array of routes' do
         subject {
           @controller.view_context
-          .search_form_for([:admin, Comment.search]) {}
+          .search_form_for([:admin, Comment.ransack]) {}
         }
         it { should match /action="\/admin\/comments"/ }
       end
@@ -851,7 +818,7 @@ module Ransack
         end
         subject {
           @controller.view_context
-          .search_form_for(Person.search) { |f| f.text_field :name_eq }
+          .search_form_for(Person.ransack) { |f| f.text_field :name_eq }
         }
         it { should match /example_name_eq/ }
       end