Skip to content

Commit f732ad0

Browse files
committed
[tests] change super to super() - jruby/jruby#6571
1 parent 42618e0 commit f732ad0

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

spec/inputs/integration/jms_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
let(:message) { "Hello There" }
1616

1717
context 'when properties are skipped' do
18-
let (:jms_config) { super.merge({'skip_properties' => ['this', 'that']})}
18+
let (:jms_config) { super().merge({'skip_properties' => ['this', 'that']})}
1919

2020
it 'should skip the specified property and process other properties, headers and the message' do
2121
send_message do |session|
@@ -35,7 +35,7 @@
3535
end
3636

3737
context 'when using message selectors' do
38-
let (:jms_config) { super.merge({'selector' => selector }) }
38+
let (:jms_config) { super().merge({'selector' => selector }) }
3939

4040
context 'with multiple selector query parameter' do
4141
let (:selector) { "this = 3 OR this = 4" }
@@ -145,7 +145,7 @@
145145
end
146146

147147
context 'when headers are skipped' do
148-
let (:jms_config) { super.merge({'skip_headers' => ['jms_destination', 'jms_reply_to']})}
148+
let (:jms_config) { super().merge({'skip_headers' => ['jms_destination', 'jms_reply_to']})}
149149
it 'should skip the specified header and process other headers, properties and the message' do
150150
send_message do |session|
151151
msg = session.message(message)
@@ -241,7 +241,7 @@
241241
end
242242

243243
context 'with pub_sub true and durable subscriber' do
244-
let (:jms_config) { super.merge({'durable_subscriber' => true,
244+
let (:jms_config) { super().merge({'durable_subscriber' => true,
245245
'durable_subscriber_client_id' => SecureRandom.hex(8),
246246
'durable_subscriber_name' => SecureRandom.hex(8) } ) }
247247

@@ -258,7 +258,7 @@
258258

259259
context 'with tls', :tls => true do
260260
let (:yaml_section) { 'activemq_tls' }
261-
let (:jms_config) { super.merge({"keystore" => fixture_path("keystore.jks"), "keystore_password" => "changeit",
261+
let (:jms_config) { super().merge({"keystore" => fixture_path("keystore.jks"), "keystore_password" => "changeit",
262262
"truststore" => fixture_path("keystore.jks"), "truststore_password" => "changeit"})}
263263

264264
context 'with pub_sub true' do
@@ -267,7 +267,7 @@
267267
end
268268

269269
context 'with pub_sub true and durable subscriber' do
270-
let (:jms_config) { super.merge({'durable_subscriber' => true,
270+
let (:jms_config) { super().merge({'durable_subscriber' => true,
271271
'durable_subscriber_client_id' => SecureRandom.hex(8),
272272
'durable_subscriber_name' => SecureRandom.hex(8) } ) }
273273

spec/inputs/unit/jms_spec.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@
3737
context 'configuration check' do
3838
context 'if threads is > 1' do
3939
let(:thread_count) { 2 }
40-
let(:jms_config) { super.merge({'threads' => thread_count})}
40+
let(:jms_config) { super().merge({'threads' => thread_count})}
4141

4242
context 'with pub_sub set to true' do
43-
let(:jms_config) { super.merge({'pub_sub' => true})}
43+
let(:jms_config) { super().merge({'pub_sub' => true})}
4444

4545
it 'should raise a configuration error' do
4646
expect { plugin.register }.to raise_error(LogStash::ConfigurationError)
4747
end
4848
end
4949

5050
context 'with pub_sub set to false' do
51-
let(:jms_config) { super.merge({'pub_sub' => false})}
51+
let(:jms_config) { super().merge({'pub_sub' => false})}
5252

5353
it 'should not raise a configuration error' do
5454
plugin.register
@@ -58,13 +58,13 @@
5858
end
5959

6060
context 'with durable_subscriber set' do
61-
let(:jms_config) { super.merge({ 'pub_sub' => true,
61+
let(:jms_config) { super().merge({ 'pub_sub' => true,
6262
'durable_subscriber' => true,
6363
'durable_subscriber_name' => SecureRandom.hex(8),
6464
'durable_subscriber_client_id' => SecureRandom.hex(8)})}
6565

6666
context 'if durable_subscriber_client_id is not set' do
67-
let(:jms_config) { super.tap { |h| h.delete('durable_subscriber_client_id') } }
67+
let(:jms_config) { super().tap { |h| h.delete('durable_subscriber_client_id') } }
6868

6969
it 'should set client_id to Logstash' do
7070
plugin.register
@@ -73,7 +73,7 @@
7373
end
7474

7575
context 'if durable_subscriber_name is not set' do
76-
let(:jms_config) { super.tap { |h| h.delete('durable_subscriber_name') } }
76+
let(:jms_config) { super().tap { |h| h.delete('durable_subscriber_name') } }
7777

7878
it 'should set name to the topic name' do
7979
plugin.register
@@ -83,7 +83,7 @@
8383

8484

8585
context 'if pub_sub is set to false' do
86-
let(:jms_config) { super.merge({'pub_sub' => false})}
86+
let(:jms_config) { super().merge({'pub_sub' => false})}
8787
it 'should raise a configuration error' do
8888
expect { plugin.register }.to raise_error(LogStash::ConfigurationError)
8989
end

0 commit comments

Comments
 (0)