Small fix and tests for ActsAsSearchable

Rafael Martins
1 parent 9eda279e
Showing 2 changed files with 47 additions and 0 deletions Show diff stats
lib/acts_as_searchable.rb
test/unit/acts_as_searchable_test.rb
@@ -7,6 +7,7 @@ module ActsAsSearchable
       return if !ACTS_AS_SEARCHABLE_ENABLED
       if (!options[:fields])
+		    options[:additional_fields] ||= []
         options[:additional_fields] |= [{:schema_name => :string}]
       else
         options[:fields] << {:schema_name => :string}
@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+
+class ActsAsSearchableTest < ActiveSupport::TestCase
+
+  def setup
+		@test_model = Class.new ActiveRecord::Base
+	end
+
+  def silent
+		# http://mentalized.net/journal/2010/04/02/suppress_warnings_from_ruby/
+		original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+
+	should 'be enabled by default' do
+		assert ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED, true
+  end
+
+  should 'not be searchable when disabled' do
+		# suppress warning about already initialized constant
+		silent { ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED = false }
+		
+    @test_model.expects(:acts_as_solr).never
+		@test_model.acts_as_searchable
+  end
+
+  should 'correctly pass options to search engine' do
+    options = {:fields => [{:name => :text}]}
+		@test_model.expects(:acts_as_solr).with(options)
+		@test_model.acts_as_searchable options
+  end
+
+	should 'always include schema name as a field' do
+		@test_model.expects(:acts_as_solr).with(has_entry(:fields, [{:field1 => :text}, {:schema_name => :string}]))
+		@test_model.acts_as_searchable :fields => [{:field1 => :text}]
+		# ...even with no fields
+		@test_model = Class.new ActiveRecord::Base
+		@test_model.expects(:acts_as_solr).with(has_entry(:additional_fields, [{:schema_name => :string}]))
+		@test_model.acts_as_searchable
+  end
+
+end
	@@ -7,6 +7,7 @@ module ActsAsSearchable		@@ -7,6 +7,7 @@ module ActsAsSearchable
7	return if !ACTS_AS_SEARCHABLE_ENABLED	7	return if !ACTS_AS_SEARCHABLE_ENABLED
8		8
9	if (!options[:fields])	9	if (!options[:fields])
		10	+ options[:additional_fields] \|\|= []
10	options[:additional_fields] \|= [{:schema_name => :string}]	11	options[:additional_fields] \|= [{:schema_name => :string}]
11	else	12	else
12	options[:fields] << {:schema_name => :string}	13	options[:fields] << {:schema_name => :string}
@@ -0,0 +1,46 @@		@@ -0,0 +1,46 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+
	4	+class ActsAsSearchableTest < ActiveSupport::TestCase
	5	+
	6	+ def setup
	7	+ @test_model = Class.new ActiveRecord::Base
	8	+ end
	9	+
	10	+ def silent
	11	+ # http://mentalized.net/journal/2010/04/02/suppress_warnings_from_ruby/
	12	+ original_verbosity = $VERBOSE
	13	+ $VERBOSE = nil
	14	+ result = yield
	15	+ $VERBOSE = original_verbosity
	16	+ return result
	17	+ end
	18	+
	19	+ should 'be enabled by default' do
	20	+ assert ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED, true
	21	+ end
	22	+
	23	+ should 'not be searchable when disabled' do
	24	+ # suppress warning about already initialized constant
	25	+ silent { ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED = false }
	26	+
	27	+ @test_model.expects(:acts_as_solr).never
	28	+ @test_model.acts_as_searchable
	29	+ end
	30	+
	31	+ should 'correctly pass options to search engine' do
	32	+ options = {:fields => [{:name => :text}]}
	33	+ @test_model.expects(:acts_as_solr).with(options)
	34	+ @test_model.acts_as_searchable options
	35	+ end
	36	+
	37	+ should 'always include schema name as a field' do
	38	+ @test_model.expects(:acts_as_solr).with(has_entry(:fields, [{:field1 => :text}, {:schema_name => :string}]))
	39	+ @test_model.acts_as_searchable :fields => [{:field1 => :text}]
	40	+ # ...even with no fields
	41	+ @test_model = Class.new ActiveRecord::Base
	42	+ @test_model.expects(:acts_as_solr).with(has_entry(:additional_fields, [{:schema_name => :string}]))
	43	+ @test_model.acts_as_searchable
	44	+ end
	45	+
	46	+end