Better test search on relations

Andrew Kane
1 parent ca27d8e4
Showing 5 changed files with 37 additions and 6 deletions Show diff stats
lib/searchkick/model.rb
test/match_test.rb
test/models/band.rb
test/support/activerecord.rb
test/support/mongoid.rb
@@ -41,8 +41,11 @@ module Searchkick
  
         class << self
           def searchkick_search(term = "*", **options, &block)
-            # TODO same for Mongoid
-            Searchkick.warn("calling search on a relation is deprecated") if respond_to?(:current_scope) && !current_scope.nil?
+            # TODO throw error in next major version
+            # TODO add Mongoid condition
+            relation = respond_to?(:current_scope) ? !current_scope.nil? : false
+            Searchkick.warn("calling search on a relation is deprecated") if relation
+
             Searchkick.search(term, model: self, **options, &block)
           end
           alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
@@ -305,13 +305,22 @@ class MatchTest &lt; Minitest::Test
   # TODO find better place
  
   def test_search_relation
-    skip unless defined?(ActiveRecord)
+    skip if defined?(Mongoid) # for now
  
-    assert_nil Product.current_scope
     _, stderr = capture_io { Product.search("*") }
     assert_equal "", stderr
-    assert Product.where(name: nil).current_scope
-    _, stderr = capture_io { Product.where(name: nil).search("*") }
+    _, stderr = capture_io { Product.all.search("*") }
+    assert_match "WARNING", stderr
+  end
+
+  def test_search_relation_default_scope
+    skip if defined?(Mongoid) # for now
+
+    Band.reindex
+
+    _, stderr = capture_io { Band.search("*") }
+    assert_equal "", stderr
+    _, stderr = capture_io { Band.all.search("*") }
     assert_match "WARNING", stderr
   end
 end
@@ -0,0 +1,3 @@
+class Band
+  searchkick
+end
@@ -91,6 +91,10 @@ ActiveRecord::Migration.create_table :songs do |t|
   t.string :name
 end
  
+ActiveRecord::Migration.create_table :bands do |t|
+  t.string :name
+end
+
 class Product < ActiveRecord::Base
   belongs_to :store
 end
@@ -119,3 +123,7 @@ end
  
 class Song < ActiveRecord::Base
 end
+
+class Band < ActiveRecord::Base
+  default_scope { where(name: "Test") }
+end
@@ -66,3 +66,11 @@ class Song
  
   field :name
 end
+
+class Band
+  include Mongoid::Document
+
+  field :name
+
+  default_scope -> { where(name: "Test") }
+end
...	...	@@ -41,8 +41,11 @@ module Searchkick
41	41
42	42	class << self
43	43	def searchkick_search(term = "", *options, &block)
44		- # TODO same for Mongoid
45		- Searchkick.warn("calling search on a relation is deprecated") if respond_to?(:current_scope) && !current_scope.nil?
	44	+ # TODO throw error in next major version
	45	+ # TODO add Mongoid condition
	46	+ relation = respond_to?(:current_scope) ? !current_scope.nil? : false
	47	+ Searchkick.warn("calling search on a relation is deprecated") if relation
	48	+
46	49	Searchkick.search(term, model: self, **options, &block)
47	50	end
48	51	alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
...	...
...	...	@@ -305,13 +305,22 @@ class MatchTest < Minitest::Test
305	305	# TODO find better place
306	306
307	307	def test_search_relation
308		- skip unless defined?(ActiveRecord)
	308	+ skip if defined?(Mongoid) # for now
309	309
310		- assert_nil Product.current_scope
311	310	_, stderr = capture_io { Product.search("*") }
312	311	assert_equal "", stderr
313		- assert Product.where(name: nil).current_scope
314		- _, stderr = capture_io { Product.where(name: nil).search("*") }
	312	+ _, stderr = capture_io { Product.all.search("*") }
	313	+ assert_match "WARNING", stderr
	314	+ end
	315	+
	316	+ def test_search_relation_default_scope
	317	+ skip if defined?(Mongoid) # for now
	318	+
	319	+ Band.reindex
	320	+
	321	+ _, stderr = capture_io { Band.search("*") }
	322	+ assert_equal "", stderr
	323	+ _, stderr = capture_io { Band.all.search("*") }
315	324	assert_match "WARNING", stderr
316	325	end
317	326	end
...	...
...	...	@@ -91,6 +91,10 @@ ActiveRecord::Migration.create_table :songs do \|t\|
91	91	t.string :name
92	92	end
93	93
	94	+ActiveRecord::Migration.create_table :bands do \|t\|
	95	+ t.string :name
	96	+end
	97	+
94	98	class Product < ActiveRecord::Base
95	99	belongs_to :store
96	100	end
...	...	@@ -119,3 +123,7 @@ end
119	123
120	124	class Song < ActiveRecord::Base
121	125	end
	126	+
	127	+class Band < ActiveRecord::Base
	128	+ default_scope { where(name: "Test") }
	129	+end
...	...
...	...	@@ -66,3 +66,11 @@ class Song
66	66
67	67	field :name
68	68	end
	69	+
	70	+class Band
	71	+ include Mongoid::Document
	72	+
	73	+ field :name
	74	+
	75	+ default_scope -> { where(name: "Test") }
	76	+end
...	...