From 45cad5161f35d49b2cb953dc113a42b5f2da2fae Mon Sep 17 00:00:00 2001 From: Jari Bakken Date: Sun, 26 Jan 2014 00:29:47 +0100 Subject: [PATCH] Make sure search request options are passed through. --- elasticsearch-model/lib/elasticsearch/model/searching.rb | 2 +- elasticsearch-model/test/unit/searching_test.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/elasticsearch-model/lib/elasticsearch/model/searching.rb b/elasticsearch-model/lib/elasticsearch/model/searching.rb index 8391be73f..b71ebbab2 100644 --- a/elasticsearch-model/lib/elasticsearch/model/searching.rb +++ b/elasticsearch-model/lib/elasticsearch/model/searching.rb @@ -95,7 +95,7 @@ module ClassMethods # Article.search '{"query" : { "match_all" : {} }}' # def search(query_or_payload, options={}) - search = SearchRequest.new(self, query_or_payload, options={}) + search = SearchRequest.new(self, query_or_payload, options) Response::Response.new(self, search) end diff --git a/elasticsearch-model/test/unit/searching_test.rb b/elasticsearch-model/test/unit/searching_test.rb index ab61456f2..8be1c9e32 100644 --- a/elasticsearch-model/test/unit/searching_test.rb +++ b/elasticsearch-model/test/unit/searching_test.rb @@ -23,10 +23,11 @@ def self.document_type; 'bar'; end .expects(:new).with do |klass, query, options| assert_equal DummySearchingModel, klass assert_equal 'foo', query + assert_equal({default_operator: 'AND'}, options) end .returns( stub('search') ) - DummySearchingModel.search 'foo' + DummySearchingModel.search 'foo', default_operator: 'AND' end should "not execute the search" do