Skip to content

Commit 00709e7

Browse files
durrandurran
committed
SPEC-222: Fixing specs
1 parent babf2b8 commit 00709e7

17 files changed

+113
-46
lines changed

‎lib/mongo/cluster/topology/sharded.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ class Sharded
2727
# @since 2.0.0
2828
NAME = 'Sharded'.freeze
2929

30+
# @return [ Hash ] options The options.
31+
attr_reader :options
32+
3033
# @return [ Monitoring ] monitoring The monitoring.
3134
attr_reader :monitoring
3235

‎spec/mongo/auth/cr_spec.rb‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@
77
end
88

99
let(:monitoring) do
10-
Mongo::Monitoring.new
10+
Mongo::Monitoring.new(monitoring: false)
1111
end
1212

1313
let(:listeners) do
1414
Mongo::Event::Listeners.new
1515
end
1616

17+
let(:topology) do
18+
double('topology')
19+
end
20+
21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
1725
let(:server) do
18-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
26+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
1927
end
2028

2129
let(:connection) do

‎spec/mongo/auth/ldap_spec.rb‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@
77
end
88

99
let(:monitoring) do
10-
Mongo::Monitoring.new
10+
Mongo::Monitoring.new(monitoring: false)
1111
end
1212

1313
let(:listeners) do
1414
Mongo::Event::Listeners.new
1515
end
1616

17+
let(:topology) do
18+
double('topology')
19+
end
20+
21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
1725
let(:server) do
18-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
26+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
1927
end
2028

2129
let(:connection) do

‎spec/mongo/auth/scram_spec.rb‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@
77
end
88

99
let(:monitoring) do
10-
Mongo::Monitoring.new
10+
Mongo::Monitoring.new(monitoring: false)
1111
end
1212

1313
let(:listeners) do
1414
Mongo::Event::Listeners.new
1515
end
1616

17+
let(:topology) do
18+
double('topology')
19+
end
20+
21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
1725
let(:server) do
18-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
26+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
1927
end
2028

2129
let(:connection) do

‎spec/mongo/auth/x509_spec.rb‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@
77
end
88

99
let(:monitoring) do
10-
Mongo::Monitoring.new
10+
Mongo::Monitoring.new(monitoring: false)
1111
end
1212

1313
let(:listeners) do
1414
Mongo::Event::Listeners.new
1515
end
1616

17+
let(:topology) do
18+
double('topology')
19+
end
20+
21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
1725
let(:server) do
18-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
26+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
1927
end
2028

2129
let(:connection) do

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,29 @@
1111
end
1212

1313
let(:monitoring) do
14-
Mongo::Monitoring.new
14+
Mongo::Monitoring.new(monitoring: false)
15+
end
16+
17+
let(:cluster) do
18+
double('cluster', topology: topology)
1519
end
1620

1721
describe '#servers' do
1822

1923
let(:mongos) do
20-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
24+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2125
end
2226

2327
let(:standalone) do
24-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
28+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2529
end
2630

2731
let(:replica_set) do
28-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
32+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2933
end
3034

3135
let(:replica_set_two) do
32-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
36+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
3337
end
3438

3539
let(:mongos_description) do
@@ -110,11 +114,11 @@
110114
describe '#add_hosts?' do
111115

112116
let(:primary) do
113-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
117+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
114118
end
115119

116120
let(:secondary) do
117-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
121+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
118122
end
119123

120124
let(:primary_description) do
@@ -193,7 +197,7 @@
193197
describe '#remove_hosts?' do
194198

195199
let(:primary) do
196-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
200+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
197201
end
198202

199203
let(:primary_description) do
@@ -274,7 +278,7 @@
274278
describe '#remove_server?' do
275279

276280
let(:secondary) do
277-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
281+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
278282
end
279283

280284
let(:secondary_description) do

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,27 @@
1111
end
1212

1313
let(:monitoring) do
14-
Mongo::Monitoring.new
14+
Mongo::Monitoring.new(monitoring: false)
1515
end
1616

1717
let(:listeners) do
1818
Mongo::Event::Listeners.new
1919
end
2020

21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
2125
let(:mongos) do
22-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
26+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2327
end
2428

2529
let(:standalone) do
26-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
30+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2731
end
2832

2933
let(:replica_set) do
30-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
34+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
3135
end
3236

3337
let(:mongos_description) do

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
let(:monitoring) do
10-
Mongo::Monitoring.new
10+
Mongo::Monitoring.new(monitoring: false)
1111
end
1212

1313
let(:topology) do
@@ -18,22 +18,26 @@
1818
Mongo::Event::Listeners.new
1919
end
2020

21+
let(:cluster) do
22+
double('cluster', topology: topology)
23+
end
24+
2125
describe '.servers' do
2226

2327
let(:mongos) do
24-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
28+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2529
end
2630

2731
let(:standalone) do
28-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
32+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
2933
end
3034

3135
let(:standalone_two) do
32-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
36+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
3337
end
3438

3539
let(:replica_set) do
36-
Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
40+
Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
3741
end
3842

3943
let(:mongos_description) do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
describe Mongo::Cluster::Topology::Unknown do
44

55
let(:monitoring) do
6-
Mongo::Monitoring.new
6+
Mongo::Monitoring.new(monitoring: false)
77
end
88

99
let(:topology) do

‎spec/mongo/cluster/topology_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
describe Mongo::Cluster::Topology do
44

55
let(:monitoring) do
6-
Mongo::Monitoring.new
6+
Mongo::Monitoring.new(monitoring: false)
77
end
88

99
describe '.initial' do

0 commit comments

Comments
 (0)