File tree Expand file tree Collapse file tree 2 files changed +5
-8
lines changed
lib/elasticsearch/model/response Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -45,8 +45,6 @@ def #{::Kaminari.config.page_method_name}(num=nil)
45
45
#
46
46
def limit_value
47
47
case
48
- when search . definition [ :body ] && search . definition [ :body ] [ :size ]
49
- search . definition [ :body ] [ :size ]
50
48
when search . definition [ :size ]
51
49
search . definition [ :size ]
52
50
else
@@ -58,8 +56,6 @@ def limit_value
58
56
#
59
57
def offset_value
60
58
case
61
- when search . definition [ :body ] && search . definition [ :body ] [ :from ]
62
- search . definition [ :body ] [ :from ]
63
59
when search . definition [ :from ]
64
60
search . definition [ :from ]
65
61
else
Original file line number Diff line number Diff line change @@ -74,12 +74,13 @@ def self.document_type; 'bar'; end
74
74
assert_equal 50 , @response . offset_value
75
75
end
76
76
77
- should "return the value from body" do
78
- search = Elasticsearch ::Model ::Searching ::SearchRequest . new ModelClass , { query : { match_all : { } } , from : 10 , size : 50 }
77
+ should "ignore the value from request body" do
78
+ search = Elasticsearch ::Model ::Searching ::SearchRequest . new ModelClass ,
79
+ { query : { match_all : { } } , from : 333 , size : 999 }
79
80
@response = Elasticsearch ::Model ::Response ::Response . new ModelClass , search , RESPONSE
80
81
81
- assert_equal 50 , @response . limit_value
82
- assert_equal 10 , @response . offset_value
82
+ assert_equal Kaminari . config . default_per_page , @response . limit_value
83
+ assert_equal 0 , @response . offset_value
83
84
end
84
85
end
85
86
You can’t perform that action at this time.
0 commit comments