Skip to content

Commit 715a582

Browse files
nielsdurran
authored andcommitted
Simplify spec/mongo/socket/ssl_spec.rb
1 parent 87ec378 commit 715a582

File tree

1 file changed

+35
-54
lines changed

1 file changed

+35
-54
lines changed

spec/mongo/socket/ssl_spec.rb

Lines changed: 35 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
require 'spec_helper'
22

3-
describe Mongo::Socket::SSL do
3+
describe Mongo::Socket::SSL, if: running_ssl? do
44

5-
describe '#connect!', if: running_ssl? do
6-
7-
let(:socket) do
8-
described_class.new(*DEFAULT_ADDRESS.split(":"), DEFAULT_ADDRESS.split(":")[0], 5, Socket::PF_INET, options)
9-
end
5+
let(:socket) do
6+
described_class.new(*DEFAULT_ADDRESS.split(":"), DEFAULT_ADDRESS.split(":")[0], 5, Socket::PF_INET, options)
7+
end
108

11-
context 'when a certificate is provided' do
9+
let(:options) do
10+
{
11+
:ssl => true,
12+
:ssl_cert => CLIENT_PEM,
13+
:ssl_key => CLIENT_PEM,
14+
:ssl_verify => false
15+
}
16+
end
1217

13-
let(:options) do
14-
{
15-
:ssl => true,
16-
:ssl_cert => CLIENT_PEM,
17-
:ssl_key => CLIENT_PEM,
18-
:ssl_verify => false
19-
}
20-
end
18+
describe '#connect!' do
2119

20+
context 'when a certificate is provided' do
2221

2322
context 'when connecting the tcp socket is successful' do
2423

@@ -55,12 +54,9 @@
5554
context 'when a bad certificate is provided' do
5655

5756
let(:options) do
58-
{
59-
:ssl => true,
60-
:ssl_cert => CLIENT_PEM,
61-
:ssl_key => CRL_PEM,
62-
:ssl_verify => false
63-
}
57+
super().merge({
58+
:ssl_key => CRL_PEM
59+
})
6460
end
6561

6662
it 'raises an exception' do
@@ -73,13 +69,10 @@
7369
context 'when a CA certificate is provided', if: testing_ssl_locally? do
7470

7571
let(:options) do
76-
{
77-
:ssl => true,
78-
:ssl_cert => CLIENT_PEM,
79-
:ssl_key => CLIENT_PEM,
80-
:ssl_ca_cert => CA_PEM,
81-
:ssl_verify => true
82-
}
72+
super().merge({
73+
:ssl_ca_cert => CA_PEM,
74+
:ssl_verify => true
75+
})
8376
end
8477

8578
before do
@@ -94,12 +87,9 @@
9487
context 'when a CA certificate is not provided', if: testing_ssl_locally? do
9588

9689
let(:options) do
97-
{
98-
:ssl => true,
99-
:ssl_cert => CLIENT_PEM,
100-
:ssl_key => CLIENT_PEM,
101-
:ssl_verify => true
102-
}
90+
super().merge({
91+
:ssl_verify => true
92+
})
10393
end
10494

10595
before do
@@ -115,12 +105,9 @@
115105
context 'when ssl_verify is not specified', if: testing_ssl_locally? do
116106

117107
let(:options) do
118-
{
119-
:ssl => true,
120-
:ssl_cert => CLIENT_PEM,
121-
:ssl_key => CLIENT_PEM,
122-
:ssl_ca_cert => CA_PEM
123-
}
108+
super().merge({
109+
:ssl_ca_cert => CA_PEM
110+
}).tap { |options| options.delete(:ssl_verify) }
124111
end
125112

126113
before do
@@ -135,13 +122,10 @@
135122
context 'when ssl_verify is true', if: testing_ssl_locally? do
136123

137124
let(:options) do
138-
{
139-
:ssl => true,
140-
:ssl_cert => CLIENT_PEM,
141-
:ssl_key => CLIENT_PEM,
142-
:ssl_ca_cert => CA_PEM,
143-
:ssl_verify => true
144-
}
125+
super().merge({
126+
:ssl_ca_cert => CA_PEM,
127+
:ssl_verify => true
128+
})
145129
end
146130

147131
before do
@@ -156,13 +140,10 @@
156140
context 'when ssl_verify is false' do
157141

158142
let(:options) do
159-
{
160-
:ssl => true,
161-
:ssl_cert => CLIENT_PEM,
162-
:ssl_key => CLIENT_PEM,
163-
:ssl_ca_cert => 'invalid',
164-
:ssl_verify => false
165-
}
143+
super().merge({
144+
:ssl_ca_cert => 'invalid',
145+
:ssl_verify => false
146+
})
166147
end
167148

168149
before do

0 commit comments

Comments
 (0)