trailblazer-finder 0.10.1 → 0.70.0

data/lib/trailblazer/finder/adapters/basic/predicates.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s == value.to_s && !v.nil? }, entity
@@ -18,7 +18,7 @@ module Trailblazer
           end
 
           def set_not_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s != value.to_s && !v.nil? }, entity
@@ -26,43 +26,43 @@ module Trailblazer
           end
 
           def set_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && Utils::String.blank?(v.to_s) }, entity
             end
           end
 
           def set_not_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !Utils::String.blank?(v.to_s) }, entity
             end
           end
 
           def set_gt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f > value.to_f }, entity
             end
           end
 
           def set_gte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f >= value.to_f }, entity
             end
           end
 
           def set_lt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_f < value.to_f }, entity
             end
           end
 
           def set_lte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_i <= value.to_f }, entity
             end
           end
 
           def set_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.include?(value.to_s) && !v.nil? }, entity
@@ -70,7 +70,7 @@ module Trailblazer
           end
 
           def set_not_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.include?(value.to_s) && !v.nil? }, entity
@@ -78,7 +78,7 @@ module Trailblazer
           end
 
           def set_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.start_with?(value.to_s) && !v.nil? }, entity
@@ -86,7 +86,7 @@ module Trailblazer
           end
 
           def set_not_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.start_with?(value.to_s) && !v.nil? }, entity
@@ -94,7 +94,7 @@ module Trailblazer
           end
 
           def set_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && v.to_s.end_with?(value.to_s) && !v.nil? }, entity
@@ -102,7 +102,7 @@ module Trailblazer
           end
 
           def set_not_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s) || Utils::String.blank?(attribute.to_s)
 
               Utils::Hash.deep_locate ->(k, v, _) { k == attribute.to_sym && !v.to_s.end_with?(value.to_s) && !v.nil? }, entity

data/lib/trailblazer/finder/adapters/basic/sorting.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_sorting_handler
-            lambda do |sort_attributes, entity|
+            ->(sort_attributes, entity) do
               sort_attributes.delete(:handler)
               attributes = []
               sort_attributes.each do |attr|

data/lib/trailblazer/finder/adapters/kaminari/paging.rb

@@ -3,14 +3,13 @@
 module Trailblazer
   class Finder
     module Adapters
-      # ActiveRecord Adapter
       module Kaminari
-        # Kaminari Paging Adapter
+        # Kaminari Paginator
         module Paging
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.page(current_page).per(per_page)
             end
           end

data/lib/trailblazer/finder/adapters/sequel/paging.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.limit(per_page).offset(([current_page, 1].max - 1) * per_page)
             end
           end

data/lib/trailblazer/finder/adapters/sequel/predicates.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where { ::Sequel[attribute.to_sym] =~ value }
@@ -18,7 +18,7 @@ module Trailblazer
           end
 
           def set_not_eq_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               return if Utils::String.blank?(value.to_s)
 
               entity.where { ::Sequel[attribute.to_sym] !~ value }
@@ -26,74 +26,74 @@ module Trailblazer
           end
 
           def set_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.where { ::Sequel.|({::Sequel[attribute.to_sym] => nil}, {::Sequel[attribute.to_sym] => ""}) }
             end
           end
 
           def set_not_blank_handler
-            lambda do |entity, attribute, _value|
+            ->(entity, attribute, _value) do
               entity.exclude(::Sequel[attribute.to_sym] => nil, ::Sequel[attribute.to_sym] => "")
               # entity.exclude(attribute.to_sym => nil).exclude(attribute.to_sym => "")
             end
           end
 
           def set_gt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] > value.to_f }
             end
           end
 
           def set_gte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] >= value.to_f }
             end
           end
 
           def set_lt_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] < value.to_f }
             end
           end
 
           def set_lte_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where { ::Sequel[attribute.to_sym] <= value.to_f }
             end
           end
 
           def set_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "%#{value}%"))
             end
           end
 
           def set_not_cont_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "%#{value}%"))
             end
           end
 
           def set_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "#{value}%"))
             end
           end
 
           def set_not_sw_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "#{value}%"))
             end
           end
 
           def set_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(::Sequel.like(attribute.to_sym, "%#{value}"))
             end
           end
 
           def set_not_ew_handler
-            lambda do |entity, attribute, value|
+            ->(entity, attribute, value) do
               entity.where(~::Sequel.like(attribute.to_sym, "%#{value}"))
             end
           end

data/lib/trailblazer/finder/adapters/sequel/sorting.rb

@@ -10,7 +10,7 @@ module Trailblazer
           module_function
 
           def set_sorting_handler
-            lambda do |sort_attributes, entity|
+            ->(sort_attributes, entity) do
               sort_attributes.delete(:handler)
               attributes = []
               sort_attributes.each do |attr|

data/lib/trailblazer/finder/adapters/will_paginate/paging.rb

@@ -3,14 +3,13 @@
 module Trailblazer
   class Finder
     module Adapters
-      # ActiveRecord Adapter
       module WillPaginate
-        # Kaminari Paging Adapter
+        # Kaminari Paginator
         module Paging
           module_function
 
           def set_paging_handler
-            lambda do |current_page, per_page, entity|
+            ->(current_page, per_page, entity) do
               entity.paginate per_page: per_page, page: current_page.zero? ? nil : current_page
             end
           end

data/lib/trailblazer/finder/dsl.rb

@@ -13,7 +13,7 @@ module Trailblazer
         config[:entity] = block
       end
 
-      def paging(options, **)
+      def paging(**options)
         config[:paging][:per_page] = options[:per_page] || 25
         config[:paging][:min_per_page] = options[:min_per_page] || 10
         config[:paging][:max_per_page] = options[:max_per_page] || 100
@@ -26,16 +26,19 @@ module Trailblazer
       end
 
       def filter_by(name, options = {}, &block)
-        config[:filters][name] = {}
-        config[:filters][name][:name] = name
-        config[:filters][name][:with] = options[:with] if options.include?(:with)
-        config[:filters][name][:block] = block || nil
+        filter_name = name.to_sym
+        config[:filters][filter_name] = {}
+        config[:filters][filter_name][:name] = name
+        config[:filters][filter_name][:with] = options[:with] if options.include?(:with)
+        config[:filters][filter_name][:block] = block || nil
       end
 
-      def adapters(*adapters)
-        adapters.each do |adapter|
-          config[:adapters].push adapter.to_s.split("::").last.gsub("}>", "") if config[:adapters]
-        end
+      def adapter(adapter)
+        config[:adapter] = adapter.to_s
+      end
+
+      def paginator(paginator)
+        config[:paginator] = paginator.to_s
       end
 
       def apply_config(options, **)

data/lib/trailblazer/finder/find.rb

@@ -17,13 +17,15 @@ module Trailblazer
       def process_filters(ctx)
         @params.reduce(@entity) do |entity, (name, value)|
           value = Utils::String.to_date(value) if Utils::String.date?(value)
-          new_entity = ctx.instance_exec entity, @filters[name.to_sym][:name], value, &@filters[name.to_sym][:handler]
+          filter = @filters[name.to_sym] || @filters[name]
+          new_entity = ctx.instance_exec entity, filter[:name], value, &filter[:handler]
           new_entity || entity
         end
       end
 
       def process_paging(ctx)
-        ctx.instance_exec @paging[:current_page], @paging[:per_page], (@sorting.empty? ? (process_filters ctx) : (process_sorting ctx)), &@paging[:handler]
+        ctx.instance_exec @paging[:current_page], @paging[:per_page],
+                          (@sorting.empty? ? (process_filters ctx) : (process_sorting ctx)), &@paging[:handler]
       end
 
       def process_sorting(ctx)

data/lib/trailblazer/finder/helpers/sorting.rb

@@ -31,7 +31,10 @@ module Trailblazer
           if sorting.nil?
             params.merge! sort: "#{attribute} #{sort_direction_for(attribute)}"
           elsif sorting.include?(attribute.to_s)
-            params.merge! sort: sorting.gsub(/#{attribute} #{sort_direction_for(attribute)}/, "#{attribute} #{reverse_sort_direction_for(attribute)}")
+            params.merge! sort: sorting.gsub(
+              /#{attribute} #{sort_direction_for(attribute)}/,
+              "#{attribute} #{reverse_sort_direction_for(attribute)}"
+            )
           else
             params.merge! sort: "#{sorting}, #{attribute} #{sort_direction_for(attribute)}"
           end

data/lib/trailblazer/finder/version.rb

@@ -2,6 +2,6 @@
 
 module Trailblazer
   class Finder
-    VERSION = "0.10.1".freeze
+    VERSION = "0.70.0"
   end
 end

data/lib/trailblazer/finder.rb

@@ -33,14 +33,8 @@ require "trailblazer/operation/finder"
 
 module Trailblazer
   class Finder
-    DRY_TYPES_VERSION = Gem::Version.new(Dry::Types::VERSION)
-    LEGACY_DRY_TYPES = DRY_TYPES_VERSION <= Gem::Version.new('1')
     module Types
-      if LEGACY_DRY_TYPES
-        include Dry::Types.module
-      else
-        include Dry.Types(default: :nominal)
-      end
+      include Dry.Types(default: :nominal)
     end
 
     include Base

data/lib/trailblazer/operation/finder.rb

@@ -12,13 +12,12 @@ Trailblazer::Operation.instance_eval do
   end
 
   class Finder
-    def call(ctx, options, **)
+    def call(ctx, **options)
       builder                = Finder::Builder.new
       ctx[:finder]           = finder = builder.call(options, options[:params])
       ctx[:model]            = finder # Don't like it, but somehow it's needed if contracts are loaded
       ctx[:"result.finder"]  = Trailblazer::Operation::Result.new(!finder.nil?, {})
 
-
       ctx[:"result.finder"].success?
     end
 
@@ -49,7 +48,8 @@ Trailblazer::Operation.instance_eval do
 
       def apply_id(params)
         return if params[:id].nil?
-        params[:id_eq] = params[:id] unless params.key?("id")
+
+        params[:id_eq] = params[:id]
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require "pry-byebug"
 require "trailblazer/developer"
 require "trailblazer/activity"
 require "trailblazer/activity/testing"

data/spec/trailblazer/finder/adapters/active_record_spec.rb

@@ -13,7 +13,7 @@ module Trailblazer
 
         def define_finder_class(&block)
           Class.new(Trailblazer::Finder) do
-            adapters ActiveRecord
+            adapter "ActiveRecord"
             entity { Product }
 
             class_eval(&block)
@@ -132,7 +132,7 @@ module Trailblazer
 
           it "sets the property and works with sw predicate" do
             5.times { |i| Product.create name: "product_#{i}" }
-            1.times { |i| Product.create name: "predicate_#{i}" }
+            Product.create name: "predicate_0"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_sw: "pr" do
               property :name, type: Types::String
@@ -144,7 +144,7 @@ module Trailblazer
 
           it "sets the property and works with not_sw predicate" do
             5.times { |i| Product.create name: "product_#{i}" }
-            1.times { |i| Product.create name: "predicate_#{i}" }
+            Product.create name: "predicate_0"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_not_sw: "pr" do
               property :name, type: Types::String
@@ -156,7 +156,7 @@ module Trailblazer
 
           it "sets the property and works with ew predicate" do
             5.times { |i| Product.create name: "product_#{i}_end" }
-            1.times { |i| Product.create name: "predicate_#{i}_endwow" }
+            Product.create name: "predicate_0_endwow"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_ew: "end" do
               property :name, type: Types::String
@@ -168,7 +168,7 @@ module Trailblazer
 
           it "sets the property and works with not_ew predicate" do
             5.times { |i| Product.create name: "product_#{i}_end" }
-            1.times { |i| Product.create name: "predicate_#{i}_endwow" }
+            Product.create name: "predicate_0_endwow"
             4.times { |i| Product.create name: "none_#{i}" }
             finder = new_finder name_not_ew: "end" do
               property :name, type: Types::String

data/spec/trailblazer/finder/adapters/basic_spec.rb

@@ -173,7 +173,10 @@ module Trailblazer
           end
 
           it "accepts per_page as a parameter" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 4 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
@@ -183,7 +186,10 @@ module Trailblazer
           end
 
           it "uses max_per_page in finder as maximum per_page" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 9 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
@@ -193,7 +199,10 @@ module Trailblazer
           end
 
           it "uses min_per_page in finder as minimum per_page" do
-            entity = [{id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"}, {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}]
+            entity = [
+              {id: 1, value: "Test 1"}, {id: 2, value: "Test 2"}, {id: 3, value: "Test 3"}, {id: 4, value: "Test 4"},
+              {id: 5, value: "Test 5"}, {id: 6, value: "Test 6"}, {id: 7, value: "Test 7"}, {id: 8, value: "Test 8"}, {id: 9, value: "Test 9"}, {id: 10, value: "Test 10"}
+            ]
             finder = new_finder entity, page: 2, per_page: 1 do
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end

data/spec/trailblazer/finder/adapters/kaminari_spec.rb

@@ -32,15 +32,15 @@ module Trailblazer
           finder_class(&block).new params: filter
         end
 
-        describe "#adapters" do
+        describe "#adapter" do
           it "cannot use kaminari without an actual orm" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder do
-              adapters Kaminari
+              paginator :Kaminari
               paging per_page: 2, min_per_page: 1, max_per_page: 5
             end
 
-            expect(finder.errors).to eq [{adapters: "Can't use paging adapters like Kaminari without using an ORM like ActiveRecord or Sequel"}]
+            expect(finder.errors).to eq [{paginator: "Can't use paginator Kaminari without using an ORM like ActiveRecord or Sequel"}]
           end
         end
 
@@ -48,7 +48,8 @@ module Trailblazer
           it "sets the paging values and shows only the first page results" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder do
-              adapters ActiveRecord, Kaminari
+              adapter :ActiveRecord
+              paginator "Kaminari"
               paging per_page: 2, min_per_page: 1, max_per_page: 5
             end
 
@@ -58,7 +59,8 @@ module Trailblazer
           it "accepts per_page as a parameter" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 4 do
-              adapters ActiveRecord, Kaminari
+              adapter "ActiveRecord"
+              paginator "Kaminari"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -69,7 +71,8 @@ module Trailblazer
           it "uses max_per_page in finder as maximum per_page" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 9 do
-              adapters ActiveRecord, Kaminari
+              adapter "ActiveRecord"
+              paginator "Kaminari"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -80,7 +83,8 @@ module Trailblazer
           it "uses min_per_page in finder as minimum per_page" do
             10.times { |i| Product.create name: "product_#{i}" }
             finder = new_finder page: 2, per_page: 1 do
-              adapters ActiveRecord, Kaminari
+              adapter "ActiveRecord"
+              paginator "Kaminari"
               paging per_page: 5, min_per_page: 2, max_per_page: 8
             end
 
@@ -94,7 +98,8 @@ module Trailblazer
             5.times { |i| Product.create name: "product_#{i}" }
             5.times { |_i| Product.create name: "product" }
             finder = new_finder name_eq: "product", sort: "id desc", page: 2 do
-              adapters ActiveRecord, Kaminari
+              adapter "ActiveRecord"
+              paginator "Kaminari"
               paging per_page: 2, min_per_page: 1, max_per_page: 5
               property :name, type: Types::String
               property :id, type: Types::Integer, sortable: true

data/spec/trailblazer/finder/adapters/sequel_spec.rb

@@ -13,7 +13,7 @@ module Trailblazer
 
         def define_finder_class(&block)
           Class.new(Trailblazer::Finder) do
-            adapters Sequel
+            adapter "Sequel"
             entity { SProduct }
 
             class_eval(&block)
@@ -132,7 +132,7 @@ module Trailblazer
 
           it "sets the property and works with sw predicate" do
             5.times { |i| SProduct.create name: "product_#{i}" }
-            1.times { |i| SProduct.create name: "predicate_#{i}" }
+            SProduct.create name: "predicate_0"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_sw: "pr" do
               property :name, type: Types::String
@@ -144,7 +144,7 @@ module Trailblazer
 
           it "sets the property and works with not_sw predicate" do
             5.times { |i| SProduct.create name: "product_#{i}" }
-            1.times { |i| SProduct.create name: "predicate_#{i}" }
+            SProduct.create name: "predicate_0"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_not_sw: "pr" do
               property :name, type: Types::String
@@ -156,7 +156,7 @@ module Trailblazer
 
           it "sets the property and works with ew predicate" do
             5.times { |i| SProduct.create name: "product_#{i}_end" }
-            1.times { |i| SProduct.create name: "predicate_#{i}_endwow" }
+            SProduct.create name: "predicate_0_endwow"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_ew: "end" do
               property :name, type: Types::String
@@ -168,7 +168,7 @@ module Trailblazer
 
           it "sets the property and works with not_ew predicate" do
             5.times { |i| SProduct.create name: "product_#{i}_end" }
-            1.times { |i| SProduct.create name: "predicate_#{i}_endwow" }
+            SProduct.create name: "predicate_0_endwow"
             4.times { |i| SProduct.create name: "none_#{i}" }
             finder = new_finder name_not_ew: "end" do
               property :name, type: Types::String