Skip to content

Commit a0954bb

Browse files
committed
Update client spec to check for adapter instead of handlers (Faraday 1.0)
1 parent 2bc91ea commit a0954bb

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

elasticsearch-transport/spec/elasticsearch/transport/client_spec.rb

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -220,41 +220,41 @@
220220
describe 'adapter' do
221221
context 'when no adapter is specified' do
222222
let(:adapter) do
223-
client.transport.connections.all.first.connection.builder.handlers
223+
client.transport.connections.all.first.connection.builder.adapter
224224
end
225225

226226
it 'uses Faraday NetHttp' do
227-
expect(adapter).to include(Faraday::Adapter::NetHttp)
227+
expect(adapter).to eq Faraday::Adapter::NetHttp
228228
end
229229
end
230230

231231
context 'when the adapter is specified' do
232232

233233
let(:adapter) do
234-
client.transport.connections.all.first.connection.builder.handlers
234+
client.transport.connections.all.first.connection.builder.adapter
235235
end
236236

237237
let(:client) do
238-
described_class.new(adapter: :typhoeus)
238+
described_class.new(adapter: :patron)
239239
end
240240

241241
it 'uses Faraday with the adapter' do
242-
expect(adapter).to include(Faraday::Adapter::Typhoeus)
242+
expect(adapter).to eq Faraday::Adapter::Patron
243243
end
244244
end
245245

246246
context 'when the adapter is specified as a string key' do
247247

248248
let(:adapter) do
249-
client.transport.connections.all.first.connection.builder.handlers
249+
client.transport.connections.all.first.connection.builder.adapter
250250
end
251251

252252
let(:client) do
253-
described_class.new('adapter' => :typhoeus)
253+
described_class.new('adapter' => :patron)
254254
end
255255

256256
it 'uses Faraday with the adapter' do
257-
expect(adapter).to include(Faraday::Adapter::Typhoeus)
257+
expect(adapter).to eq Faraday::Adapter::Patron
258258
end
259259
end
260260

@@ -266,29 +266,33 @@
266266
end
267267

268268
let(:adapter) do
269-
client.transport.connections.all.first.connection.builder.handlers
269+
client.transport.connections.all.first.connection.builder.adapter
270270
end
271271

272272
it 'uses the detected adapter' do
273-
expect(adapter).to include(Faraday::Adapter::Patron)
273+
expect(adapter).to eq Faraday::Adapter::Patron
274274
end
275275
end
276276

277277
context 'when the Faraday adapter is configured' do
278278

279279
let(:client) do
280280
described_class.new do |faraday|
281-
faraday.adapter :typhoeus
281+
faraday.adapter :patron
282282
faraday.response :logger
283283
end
284284
end
285285

286+
let(:adapter) do
287+
client.transport.connections.all.first.connection.builder.adapter
288+
end
289+
286290
let(:handlers) do
287291
client.transport.connections.all.first.connection.builder.handlers
288292
end
289293

290294
it 'sets the adapter' do
291-
expect(handlers).to include(Faraday::Adapter::Typhoeus)
295+
expect(adapter).to eq Faraday::Adapter::Patron
292296
end
293297

294298
it 'sets the logger' do
@@ -1209,23 +1213,22 @@
12091213
end
12101214

12111215
context 'when the Faraday adapter is set in the block' do
1212-
12131216
let(:client) do
12141217
Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
12151218
client.adapter(:net_http_persistent)
12161219
end
12171220
end
12181221

1219-
let(:connection_handler) do
1220-
client.transport.connections.first.connection.builder.handlers.first
1222+
let(:handler_name) do
1223+
client.transport.connections.first.connection.builder.adapter.name
12211224
end
12221225

12231226
let(:response) do
12241227
client.perform_request('GET', '_cluster/health')
12251228
end
12261229

12271230
it 'sets the adapter' do
1228-
expect(connection_handler.name).to eq('Faraday::Adapter::NetHttpPersistent')
1231+
expect(handler_name).to eq('Faraday::Adapter::NetHttpPersistent')
12291232
end
12301233

12311234
it 'uses the adapter to connect' do
@@ -1559,12 +1562,12 @@
15591562
{ adapter: :patron }
15601563
end
15611564

1562-
let(:connection_handler) do
1563-
client.transport.connections.first.connection.builder.handlers.first
1565+
let(:adapter) do
1566+
client.transport.connections.first.connection.builder.adapter
15641567
end
15651568

15661569
it 'uses the patron connection handler' do
1567-
expect(connection_handler).to eq('Faraday::Adapter::Patron')
1570+
expect(adapter).to eq('Faraday::Adapter::Patron')
15681571
end
15691572

15701573
it 'keeps connections open' do

0 commit comments

Comments
 (0)