spec/elasticsearch/api/actions/msearch_spec.rb in elasticsearch-api-7.9.0 vs spec/elasticsearch/api/actions/msearch_spec.rb in elasticsearch-api-7.10.0.pre

- old
+ new

@@ -47,17 +47,16 @@ let(:client) do Class.new { include Elasticsearch::API }.new end it 'requires the :body argument' do - expect { + expect do client.msearch - }.to raise_exception(ArgumentError) + end.to raise_exception(ArgumentError) end context 'when the body is an object' do - let(:body) do <<-PAYLOAD.gsub(/^\s+/, '') {"index":"foo"} {"query":{"match_all":{}}} {"index":"bar"} @@ -66,31 +65,33 @@ {"facets":{"tags":{}}} PAYLOAD end it 'performs the request' do - expect(client_double.msearch body: [ - { index: 'foo', search: { query: { match_all: {} } } }, - { index: 'bar', search: { query: { match: { foo: 'bar' } } } }, - { search_type: 'count', search: { facets: { tags: {} } } } - ]) + expect( + client_double.msearch( + body: [ + { index: 'foo', search: { query: { match_all: {} } } }, + { index: 'bar', search: { query: { match: { foo: 'bar' } } } }, + { search_type: 'count', search: { facets: { tags: {} } } } + ] + ) + ) end end context 'when the body is a string' do - let(:body) do %Q|{"foo":"bar"}\n{"moo":"lam"}| end it 'performs the request' do expect(client_double.msearch(body: %Q|{"foo":"bar"}\n{"moo":"lam"}|)).to eq({}) end end context 'when an index is specified' do - let(:url) do 'foo/_msearch' end let(:body) do @@ -100,56 +101,38 @@ it 'performs the request' do expect(client_double.msearch(index: 'foo', body: [])) end end - context 'when a type and index are specified' do - + context 'when multiple indices are specified' do let(:url) do - 'foo/bar/_msearch' + 'foo,bar/_msearch' end let(:body) do '' end it 'performs the request' do - expect(client_double.msearch(index: 'foo', type: 'bar', body: [])) + expect(client_double.msearch(index: ['foo', 'bar'], body: [])) end end - context 'when multiple indices and multiple types are specified' do - - let(:url) do - 'foo,bar/lam,bam/_msearch' - end - - let(:body) do - '' - end - - it 'performs the request' do - expect(client_double.msearch(index: ['foo', 'bar'], type: ['lam', 'bam'], body: [])) - end - end - context 'when the request needs to be URL-escaped' do - let(:url) do - 'foo%5Ebar/bar%2Fbam/_msearch' + 'foo%5Ebar/_msearch' end let(:body) do '' end it 'performs the request' do - expect(client_double.msearch(index: 'foo^bar', type: 'bar/bam', body: [])).to eq({}) + expect(client_double.msearch(index: 'foo^bar', body: [])).to eq({}) end end context 'when the URL params need to be URL-encoded' do - let(:url) do '_msearch' end let(:body) do