Skip to content

Commit f9279b3

Browse files
durrandurran
committed
SPEC-200: Fix rebase with latest changes
1 parent ca6b4ea commit f9279b3

File tree

5 files changed

+53
-22
lines changed

5 files changed

+53
-22
lines changed

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,30 @@
66
Mongo::Address.new('127.0.0.1:27017')
77
end
88

9+
let(:listeners) do
10+
Mongo::Event::Listeners.new
11+
end
12+
13+
let(:monitoring) do
14+
Mongo::Monitoring.new
15+
end
16+
917
describe '#servers' do
1018

1119
let(:mongos) do
12-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
20+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
1321
end
1422

1523
let(:standalone) do
16-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
24+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
1725
end
1826

1927
let(:replica_set) do
20-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
28+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2129
end
2230

2331
let(:replica_set_two) do
24-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
32+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2533
end
2634

2735
let(:mongos_description) do
@@ -102,11 +110,11 @@
102110
describe '#add_hosts?' do
103111

104112
let(:primary) do
105-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
113+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
106114
end
107115

108116
let(:secondary) do
109-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
117+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
110118
end
111119

112120
let(:primary_description) do
@@ -183,7 +191,7 @@
183191
describe '#remove_hosts?' do
184192

185193
let(:primary) do
186-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
194+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
187195
end
188196

189197
let(:primary_description) do
@@ -262,7 +270,7 @@
262270
describe '#remove_server?' do
263271

264272
let(:secondary) do
265-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
273+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
266274
end
267275

268276
let(:secondary_description) do
@@ -346,6 +354,5 @@
346354
expect(topology.remove_server?(description, secondary)).to eq(false)
347355
end
348356
end
349-
350357
end
351358
end

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,24 @@
1010
described_class.new({})
1111
end
1212

13+
let(:monitoring) do
14+
Mongo::Monitoring.new
15+
end
16+
17+
let(:listeners) do
18+
Mongo::Event::Listeners.new
19+
end
1320

1421
let(:mongos) do
15-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
22+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
1623
end
1724

1825
let(:standalone) do
19-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
26+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2027
end
2128

2229
let(:replica_set) do
23-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
30+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2431
end
2532

2633
let(:mongos_description) do

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,30 @@
1010
described_class.new({})
1111
end
1212

13+
let(:monitoring) do
14+
Mongo::Monitoring.new
15+
end
16+
17+
let(:listeners) do
18+
Mongo::Event::Listeners.new
19+
end
20+
1321
describe '.servers' do
1422

1523
let(:mongos) do
16-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
24+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
1725
end
1826

1927
let(:standalone) do
20-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
28+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2129
end
2230

2331
let(:standalone_two) do
24-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
32+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2533
end
2634

2735
let(:replica_set) do
28-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
36+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
2937
end
3038

3139
let(:mongos_description) do

‎spec/mongo/server/connection_pool_spec.rb

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66
Mongo::Address.new('127.0.0.1:27017')
77
end
88

9+
let(:monitoring) do
10+
Mongo::Monitoring.new
11+
end
12+
13+
let(:listeners) do
14+
Mongo::Event::Listeners.new
15+
end
16+
917
describe '#checkin' do
1018

1119
let(:server) do
12-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
20+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, ssl: SSL)
1321
end
1422

1523
let!(:pool) do
@@ -39,7 +47,7 @@
3947
describe '#checkout' do
4048

4149
let(:server) do
42-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
50+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, ssl: SSL)
4351
end
4452

4553
let!(:pool) do
@@ -87,7 +95,7 @@
8795
describe '.get' do
8896

8997
let(:server) do
90-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
98+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, ssl: SSL)
9199
end
92100

93101
let!(:pool) do
@@ -102,7 +110,7 @@
102110
describe '#inspect' do
103111

104112
let(:server) do
105-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
113+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, ssl: SSL)
106114
end
107115

108116
let!(:pool) do
@@ -121,7 +129,7 @@
121129
describe '#with_connection' do
122130

123131
let(:server) do
124-
Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
132+
Mongo::Server.new(address, double('cluster'), monitoring, listeners, ssl: SSL)
125133
end
126134

127135
let!(:pool) do

‎spec/support/shared/server_selector.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ def server(mode, options = {})
1111
}
1212

1313
listeners = Mongo::Event::Listeners.new
14+
monitoring = Mongo::Monitoring.new
1415
address = Mongo::Address.new('127.0.0.1:27017')
1516

16-
server = Mongo::Server.new(address, double('cluster'), listeners, TEST_OPTIONS)
17+
server = Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
1718
description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
1819
server.tap do |s|
1920
allow(s).to receive(:description).and_return(description)

0 commit comments

Comments
 (0)