From 31616fbdc580407f21148c1e4d74c433f9e7f1a5 Mon Sep 17 00:00:00 2001 From: Tomasz Pajor Date: Sun, 27 Nov 2022 18:48:23 +0100 Subject: [PATCH 1/2] use ransack instead of search --- lib/macros/model/search.rb | 2 +- spec/lib/macros/model/search_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/macros/model/search.rb b/lib/macros/model/search.rb index 052f686..a06245b 100644 --- a/lib/macros/model/search.rb +++ b/lib/macros/model/search.rb @@ -26,7 +26,7 @@ def initialize(name: 'model', default_sort_order: nil) # @param ctx [Trailblazer::Skill] trbr context hash # @param current_search [Hash] hash with ransack search details def call(ctx, current_search:, **) - search = ctx[@name].search(current_search) + search = ctx[@name].ransack(current_search) search.sorts = @default_sort_order if search.sorts.empty? ctx["#{@name}_search"] = search diff --git a/spec/lib/macros/model/search_spec.rb b/spec/lib/macros/model/search_spec.rb index 5cc3eec..8c2d21d 100644 --- a/spec/lib/macros/model/search_spec.rb +++ b/spec/lib/macros/model/search_spec.rb @@ -3,7 +3,7 @@ RSpec.describe_current do let(:klass) do Class.new do - def self.search(_current_search); end + def self.ransack(_current_search); end self end From ef5b44a701eb3e06094356b997203f0e64a40e25 Mon Sep 17 00:00:00 2001 From: Tomasz Pajor Date: Sun, 27 Nov 2022 18:51:44 +0100 Subject: [PATCH 2/2] more --- spec/lib/macros/model/search_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/macros/model/search_spec.rb b/spec/lib/macros/model/search_spec.rb index 8c2d21d..7821959 100644 --- a/spec/lib/macros/model/search_spec.rb +++ b/spec/lib/macros/model/search_spec.rb @@ -15,8 +15,8 @@ def self.ransack(_current_search); end let(:sorts) { [] } before do - allow(klass).to receive(:search).with(current_search).and_return(search) paginate_step.call(ctx, current_search: current_search) + allow(klass).to receive(:ransack).with(current_search).and_return(search) end context 'when we want to search model' do