Skip to content

Commit 610550e

Browse files
committed
[tests] change super to super() - jruby/jruby#6571
1 parent 7339e96 commit 610550e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

spec/filters/elasticsearch_spec.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
'sample:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2OjkyNDMkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA6OTI0NA=='
314314
end
315315

316-
let(:config) { super.merge({ 'cloud_id' => valid_cloud_id }) }
316+
let(:config) { super().merge({ 'cloud_id' => valid_cloud_id }) }
317317

318318
it "should set host(s)" do
319319
plugin.register
@@ -328,15 +328,15 @@
328328
end
329329

330330
context 'invalid' do
331-
let(:config) { super.merge({ 'cloud_id' => 'invalid:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlv' }) }
331+
let(:config) { super().merge({ 'cloud_id' => 'invalid:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlv' }) }
332332

333333
it "should fail" do
334334
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /cloud_id.*? is invalid/
335335
end
336336
end
337337

338338
context 'hosts also set' do
339-
let(:config) { super.merge({ 'cloud_id' => valid_cloud_id, 'hosts' => [ 'localhost:9200' ] }) }
339+
let(:config) { super().merge({ 'cloud_id' => valid_cloud_id, 'hosts' => [ 'localhost:9200' ] }) }
340340

341341
it "should fail" do
342342
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /cloud_id and hosts/
@@ -345,7 +345,7 @@
345345
end if LOGSTASH_VERSION > '6.0'
346346

347347
describe "cloud.auth" do
348-
let(:config) { super.merge({ 'cloud_auth' => LogStash::Util::Password.new('elastic:my-passwd-00') }) }
348+
let(:config) { super().merge({ 'cloud_auth' => LogStash::Util::Password.new('elastic:my-passwd-00') }) }
349349

350350
it "should set authorization" do
351351
plugin.register
@@ -356,15 +356,15 @@
356356
end
357357

358358
context 'invalid' do
359-
let(:config) { super.merge({ 'cloud_auth' => 'invalid-format' }) }
359+
let(:config) { super().merge({ 'cloud_auth' => 'invalid-format' }) }
360360

361361
it "should fail" do
362362
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /cloud_auth.*? format/
363363
end
364364
end
365365

366366
context 'user also set' do
367-
let(:config) { super.merge({ 'cloud_auth' => 'elastic:my-passwd-00', 'user' => 'another' }) }
367+
let(:config) { super().merge({ 'cloud_auth' => 'elastic:my-passwd-00', 'user' => 'another' }) }
368368

369369
it "should fail" do
370370
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /Multiple authentication options are specified/
@@ -374,15 +374,15 @@
374374

375375
describe "api_key" do
376376
context "without ssl" do
377-
let(:config) { super.merge({ 'api_key' => LogStash::Util::Password.new('foo:bar') }) }
377+
let(:config) { super().merge({ 'api_key' => LogStash::Util::Password.new('foo:bar') }) }
378378

379379
it "should fail" do
380380
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /api_key authentication requires SSL\/TLS/
381381
end
382382
end
383383

384384
context "with ssl" do
385-
let(:config) { super.merge({ 'api_key' => LogStash::Util::Password.new('foo:bar'), "ssl" => true }) }
385+
let(:config) { super().merge({ 'api_key' => LogStash::Util::Password.new('foo:bar'), "ssl" => true }) }
386386

387387
it "should set authorization" do
388388
plugin.register
@@ -393,7 +393,7 @@
393393
end
394394

395395
context 'user also set' do
396-
let(:config) { super.merge({ 'api_key' => 'foo:bar', 'user' => 'another' }) }
396+
let(:config) { super().merge({ 'api_key' => 'foo:bar', 'user' => 'another' }) }
397397

398398
it "should fail" do
399399
expect { plugin.register }.to raise_error LogStash::ConfigurationError, /Multiple authentication options are specified/
@@ -404,7 +404,7 @@
404404

405405
describe "proxy" do
406406
context 'valid' do
407-
let(:config) { super.merge({ 'proxy' => 'http://localhost:1234' }) }
407+
let(:config) { super().merge({ 'proxy' => 'http://localhost:1234' }) }
408408

409409
it "should set proxy" do
410410
plugin.register
@@ -416,7 +416,7 @@
416416
end
417417

418418
context 'invalid' do
419-
let(:config) { super.merge({ 'proxy' => '${A_MISSING_ENV_VAR:}' }) }
419+
let(:config) { super().merge({ 'proxy' => '${A_MISSING_ENV_VAR:}' }) }
420420

421421
it "should not set proxy" do
422422
plugin.register

0 commit comments

Comments
 (0)