Skip to content

Commit 3f72d31

Browse files
estolfoestolfo
committed
Update Server#initialize uses
1 parent fcd7b7d commit 3f72d31

15 files changed

+37
-37
lines changed

‎lib/mongo/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def initialize(address, cluster, event_listeners, options = {})
128128
# Get a pretty printed server inspection.
129129
#
130130
# @example Get the server inspection.
131-
# server.inspec
131+
# server.inspect
132132
#
133133
# @return [ String ] The nice inspection string.
134134
#

‎spec/mongo/auth/cr_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:server) do
10-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
10+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1111
end
1212

1313
let(:connection) do

‎spec/mongo/auth/ldap_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:server) do
10-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
10+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1111
end
1212

1313
let(:connection) do

‎spec/mongo/auth/scram_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:server) do
10-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
10+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1111
end
1212

1313
let(:connection) do

‎spec/mongo/auth/x509_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:server) do
10-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
10+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1111
end
1212

1313
let(:connection) do

‎spec/mongo/cluster/topology/replica_set_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
describe '#servers' do
1010

1111
let(:mongos) do
12-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
12+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1313
end
1414

1515
let(:standalone) do
16-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
16+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1717
end
1818

1919
let(:replica_set) do
20-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
20+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2121
end
2222

2323
let(:replica_set_two) do
24-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
24+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2525
end
2626

2727
let(:mongos_description) do
@@ -102,11 +102,11 @@
102102
describe '#add_hosts?' do
103103

104104
let(:primary) do
105-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
105+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
106106
end
107107

108108
let(:secondary) do
109-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
109+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
110110
end
111111

112112
let(:primary_description) do
@@ -183,7 +183,7 @@
183183
describe '#remove_hosts?' do
184184

185185
let(:primary) do
186-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
186+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
187187
end
188188

189189
let(:primary_description) do
@@ -262,7 +262,7 @@
262262
describe '#remove_server?' do
263263

264264
let(:secondary) do
265-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
265+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
266266
end
267267

268268
let(:secondary_description) do

‎spec/mongo/cluster/topology/sharded_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313

1414
let(:mongos) do
15-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
15+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1616
end
1717

1818
let(:standalone) do
19-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
19+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2020
end
2121

2222
let(:replica_set) do
23-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
23+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2424
end
2525

2626
let(:mongos_description) do

‎spec/mongo/cluster/topology/single_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
describe '.servers' do
1414

1515
let(:mongos) do
16-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
16+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
1717
end
1818

1919
let(:standalone) do
20-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
20+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2121
end
2222

2323
let(:standalone_two) do
24-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
24+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2525
end
2626

2727
let(:replica_set) do
28-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
28+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
2929
end
3030

3131
let(:mongos_description) do

‎spec/mongo/cluster_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@
221221
end
222222

223223
let(:server_a) do
224-
Mongo::Server.new(address_a, Mongo::Event::Listeners.new)
224+
Mongo::Server.new(address_a, cluster, Mongo::Event::Listeners.new)
225225
end
226226

227227
let(:server_b) do
228-
Mongo::Server.new(address_b, Mongo::Event::Listeners.new)
228+
Mongo::Server.new(address_b, cluster, Mongo::Event::Listeners.new)
229229
end
230230

231231
let(:servers) do
@@ -310,7 +310,7 @@
310310
end
311311

312312
let(:server) do
313-
Mongo::Server.new(address, listeners)
313+
Mongo::Server.new(address, cluster, listeners)
314314
end
315315

316316
let(:servers) do

‎spec/mongo/server/connection_pool_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
describe '#checkin' do
1010

1111
let(:server) do
12-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
12+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
1313
end
1414

1515
let(:pool) do
@@ -39,7 +39,7 @@
3939
describe '#checkout' do
4040

4141
let(:server) do
42-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
42+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
4343
end
4444

4545
let(:pool) do
@@ -87,7 +87,7 @@
8787
describe '.get' do
8888

8989
let(:server) do
90-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
90+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
9191
end
9292

9393
let(:pool) do
@@ -102,7 +102,7 @@
102102
describe '#inspect' do
103103

104104
let(:server) do
105-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
105+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
106106
end
107107

108108
let(:pool) do
@@ -121,7 +121,7 @@
121121
describe '#with_connection' do
122122

123123
let(:server) do
124-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
124+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
125125
end
126126

127127
let(:pool) do

‎spec/mongo/server/connection_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:server) do
10-
Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
10+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
1111
end
1212

1313
describe '#connect!' do

‎spec/mongo/server/description_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
end
583583

584584
let(:server) do
585-
Mongo::Server.new(address, listeners)
585+
Mongo::Server.new(address, double('cluster'), listeners)
586586
end
587587

588588
let(:description) do
@@ -603,7 +603,7 @@
603603
end
604604

605605
let(:server) do
606-
Mongo::Server.new(other_address, listeners)
606+
Mongo::Server.new(other_address, double('cluster'), listeners)
607607
end
608608

609609
it 'returns false' do
@@ -627,7 +627,7 @@
627627
end
628628

629629
let(:server) do
630-
Mongo::Server.new(server_address, listeners)
630+
Mongo::Server.new(server_address, double('cluster'), listeners)
631631
end
632632

633633
context 'when the server is included in the description hosts list' do

‎spec/mongo/server_discovery_and_monitoring_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ def family(host)
9696
# For each response in the phase, we need to change that server's
9797
# description.
9898
server = find_server(@client, response.address)
99-
server = Mongo::Server.new(Mongo::Address.new(response.address), @client.cluster.send(:event_listeners),
100-
@client.cluster.options) unless server
99+
server = Mongo::Server.new(Mongo::Address.new(response.address), @client.cluster,
100+
@client.cluster.send(:event_listeners), @client.cluster.options) unless server
101101
monitor = server.instance_variable_get(:@monitor)
102102
description = monitor.inspector.run(server.description, response.ismaster, 0.5)
103103
monitor.instance_variable_set(:@description, description)

‎spec/mongo/server_selection_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
let(:candidate_servers) do
2727
spec.candidate_servers.collect do |server|
2828
address = Mongo::Address.new(server['address'])
29-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
29+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
3030
allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
3131
allow(s).to receive(:tags).and_return(server['tags'])
3232
allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -38,7 +38,7 @@
3838
let(:in_latency_window) do
3939
spec.in_latency_window.collect do |server|
4040
address = Mongo::Address.new(server['address'])
41-
Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
41+
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
4242
allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
4343
allow(s).to receive(:tags).and_return(server['tags'])
4444
end

‎spec/support/shared/server_selector.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def server(mode, options = {})
1313
listeners = Mongo::Event::Listeners.new
1414
address = Mongo::Address.new('127.0.0.1:27017')
1515

16-
server = Mongo::Server.new(address, listeners, TEST_OPTIONS)
16+
server = Mongo::Server.new(address, double('cluster'), listeners, TEST_OPTIONS)
1717
description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
1818
server.tap do |s|
1919
allow(s).to receive(:description).and_return(description)

0 commit comments

Comments
 (0)