[FIX] Fix broken unit tests for facets

Fixes karmi/retire@5a28781
alphagov · Jan 4, 2013 · 087d3c8 · 087d3c8
1 parent 5a28781
commit 087d3c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/tire/search/facet.rb b/lib/tire/search/facet.rb
@@ -27,9 +27,9 @@ def terms(field, options={})
       end
 
       def date(field, options={})
-        interval = options.delete(:interval) || 'day'
+        interval = { :interval => options.delete(:interval) || 'day' }
         fields   = options[:value_field] || options[:value_script] ? { :key_field => field } : { :field => field }
-        @value[:date_histogram] = { :interval => interval }.update(fields).update(options)
+        @value[:date_histogram] = {}.update(fields).update(interval).update(options)
         self
       end
 

diff --git a/test/unit/search_facet_test.rb b/test/unit/search_facet_test.rb
@@ -115,7 +115,7 @@ def foo; 'bar'; end
 
         should "encode custom options" do
           f = Facet.new('date') { date :published_on, :value_field => 'price'  }
-          assert_equal( {:date=>{:date_histogram=>{:field=>'published_on',:interval=>'day',:value_field=>'price' } } }.to_json,
+          assert_equal( {:date=>{:date_histogram=>{:key_field=>'published_on',:interval=>'day',:value_field=>'price' } } }.to_json,
                         f.to_json )
         end