Skip to content

Commit 798d3e6

Browse files
HarlemSquirrelHarlemSquirrel
authored
Merge pull request #344 from fwininger/rubocop
Enhance rubocop configuration and test syntax
2 parents ca98819 + 30e4167 commit 798d3e6

File tree

14 files changed

+309
-330
lines changed

14 files changed

+309
-330
lines changed

‎.rubocop_todo.yml‎

Lines changed: 223 additions & 237 deletions
Large diffs are not rendered by default.

‎test/ber/test_ber.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_utf8_encodable_strings
9595
def test_encode_binary_data
9696
# This is used for searching for GUIDs in Active Directory
9797
assert_equal "\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16".b,
98-
["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin
98+
["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin
9999
end
100100

101101
def test_non_utf8_encodable_strings

‎test/integration/test_ber.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ def test_true_ber_encoding
2525
end
2626

2727
assert_includes Net::LDAP::ResultCodesSearchSuccess,
28-
@ldap.get_operation_result.code, "should be a successful search operation"
28+
@ldap.get_operation_result.code, "should be a successful search operation"
2929
end
3030
end

‎test/integration/test_bind.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require_relative '../test_helper'
22

33
class TestBindIntegration < LDAPIntegrationTestCase
4-
54
INTEGRATION_HOSTNAME = 'ldap.example.org'.freeze
65

76
def test_bind_success
@@ -28,7 +27,7 @@ def test_bind_anonymous_fail
2827
assert_equal Net::LDAP::ResultCodeUnwillingToPerform, result.code
2928
assert_equal Net::LDAP::ResultStrings[Net::LDAP::ResultCodeUnwillingToPerform], result.message
3029
assert_equal "unauthenticated bind (DN with no password) disallowed",
31-
result.error_message
30+
result.error_message
3231
assert_equal "", result.matched_dn
3332
end
3433

‎test/integration/test_password_modify.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ def test_password_modify
3535
new_password: 'passworD2')
3636

3737
assert @ldap.get_operation_result.extended_response.nil?,
38-
'Should not have generated a new password'
38+
'Should not have generated a new password'
3939

4040
refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
41-
'Old password should no longer be valid'
41+
'Old password should no longer be valid'
4242

4343
assert @ldap.bind(username: @dn, password: 'passworD2', method: :simple),
44-
'New password should be valid'
44+
'New password should be valid'
4545
end
4646

4747
def test_password_modify_generate
@@ -54,10 +54,10 @@ def test_password_modify_generate
5454
assert generated_password, 'Should have generated a password'
5555

5656
refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
57-
'Old password should no longer be valid'
57+
'Old password should no longer be valid'
5858

5959
assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
60-
'New password should be valid'
60+
'New password should be valid'
6161
end
6262

6363
def test_password_modify_generate_no_old_password
@@ -69,10 +69,10 @@ def test_password_modify_generate_no_old_password
6969
assert generated_password, 'Should have generated a password'
7070

7171
refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
72-
'Old password should no longer be valid'
72+
'Old password should no longer be valid'
7373

7474
assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
75-
'New password should be valid'
75+
'New password should be valid'
7676
end
7777

7878
def test_password_modify_overwrite_old_password
@@ -81,10 +81,10 @@ def test_password_modify_overwrite_old_password
8181
new_password: 'passworD3')
8282

8383
refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
84-
'Old password should no longer be valid'
84+
'Old password should no longer be valid'
8585

8686
assert @ldap.bind(username: @dn, password: 'passworD3', method: :simple),
87-
'New password should be valid'
87+
'New password should be valid'
8888
end
8989

9090
def teardown

‎test/test_entry.rb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ def setup
4747
%Q{dn: something
4848
foo: foo
4949
barAttribute: bar
50-
})
50+
},
51+
)
5152
end
5253

5354
def test_attribute
@@ -59,7 +60,7 @@ def test_modify_attribute
5960
@entry.foo = 'bar'
6061
assert_equal ['bar'], @entry.foo
6162

62-
@entry.fOo= 'baz'
63+
@entry.fOo = 'baz'
6364
assert_equal ['baz'], @entry.foo
6465
end
6566
end

‎test/test_filter_parser.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# encoding: utf-8
2+
23
require_relative 'test_helper'
34

45
class TestFilterParser < Test::Unit::TestCase

‎test/test_ldap.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_encryption
9494

9595
def test_normalize_encryption_symbol
9696
enc = @subject.send(:normalize_encryption, :start_tls)
97-
assert_equal enc, {:method => :start_tls, :tls_options => {}}
97+
assert_equal enc, :method => :start_tls, :tls_options => {}
9898
end
9999

100100
def test_normalize_encryption_nil
@@ -104,11 +104,11 @@ def test_normalize_encryption_nil
104104

105105
def test_normalize_encryption_string
106106
enc = @subject.send(:normalize_encryption, 'start_tls')
107-
assert_equal enc, {:method => :start_tls, :tls_options => {}}
107+
assert_equal enc, :method => :start_tls, :tls_options => {}
108108
end
109109

110110
def test_normalize_encryption_hash
111-
enc = @subject.send(:normalize_encryption, {:method => :start_tls, :tls_options => {:foo => :bar}})
112-
assert_equal enc, {:method => :start_tls, :tls_options => {:foo => :bar}}
111+
enc = @subject.send(:normalize_encryption, :method => :start_tls, :tls_options => { :foo => :bar })
112+
assert_equal enc, :method => :start_tls, :tls_options => { :foo => :bar }
113113
end
114114
end

‎test/test_ldap_connection.rb‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_modify_ops_add
124124
end
125125

126126
def test_modify_ops_replace
127-
args = { :operations =>[[:replace, "mail", "[email protected]"]] }
127+
args = { :operations => [[:replace, "mail", "[email protected]"]] }
128128
result = Net::LDAP::Connection.modify_ops(args[:operations])
129129
expected = ["0#\n\x01\x020\x1E\x04\x04mail1\x16\x04\x14[email protected]"]
130130
assert_equal(expected, result)
@@ -191,9 +191,9 @@ def test_queued_read_reads_until_message_id_match
191191
result2 = make_message(2)
192192

193193
mock = flexmock("socket")
194-
mock.should_receive(:read_ber).
195-
and_return(result1).
196-
and_return(result2)
194+
mock.should_receive(:read_ber)
195+
.and_return(result1)
196+
.and_return(result2)
197197
conn = Net::LDAP::Connection.new(:socket => mock)
198198

199199
assert result = conn.queued_read(2)
@@ -206,9 +206,9 @@ def test_queued_read_modify
206206
result2 = make_message(2, app_tag: Net::LDAP::PDU::ModifyResponse)
207207

208208
mock = flexmock("socket")
209-
mock.should_receive(:read_ber).
210-
and_return(result1).
211-
and_return(result2)
209+
mock.should_receive(:read_ber)
210+
.and_return(result1)
211+
.and_return(result2)
212212
mock.should_receive(:write)
213213
conn = Net::LDAP::Connection.new(:socket => mock)
214214

@@ -227,9 +227,9 @@ def test_queued_read_add
227227
result2 = make_message(2, app_tag: Net::LDAP::PDU::AddResponse)
228228

229229
mock = flexmock("socket")
230-
mock.should_receive(:read_ber).
231-
and_return(result1).
232-
and_return(result2)
230+
mock.should_receive(:read_ber)
231+
.and_return(result1)
232+
.and_return(result2)
233233
mock.should_receive(:write)
234234
conn = Net::LDAP::Connection.new(:socket => mock)
235235

@@ -245,9 +245,9 @@ def test_queued_read_rename
245245
result2 = make_message(2, app_tag: Net::LDAP::PDU::ModifyRDNResponse)
246246

247247
mock = flexmock("socket")
248-
mock.should_receive(:read_ber).
249-
and_return(result1).
250-
and_return(result2)
248+
mock.should_receive(:read_ber)
249+
.and_return(result1)
250+
.and_return(result2)
251251
mock.should_receive(:write)
252252
conn = Net::LDAP::Connection.new(:socket => mock)
253253

@@ -266,9 +266,9 @@ def test_queued_read_delete
266266
result2 = make_message(2, app_tag: Net::LDAP::PDU::DeleteResponse)
267267

268268
mock = flexmock("socket")
269-
mock.should_receive(:read_ber).
270-
and_return(result1).
271-
and_return(result2)
269+
mock.should_receive(:read_ber)
270+
.and_return(result1)
271+
.and_return(result2)
272272
mock.should_receive(:write)
273273
conn = Net::LDAP::Connection.new(:socket => mock)
274274

@@ -284,13 +284,13 @@ def test_queued_read_setup_encryption_with_start_tls
284284
result2 = make_message(2, app_tag: Net::LDAP::PDU::ExtendedResponse)
285285

286286
mock = flexmock("socket")
287-
mock.should_receive(:read_ber).
288-
and_return(result1).
289-
and_return(result2)
287+
mock.should_receive(:read_ber)
288+
.and_return(result1)
289+
.and_return(result2)
290290
mock.should_receive(:write)
291291
conn = Net::LDAP::Connection.new(:socket => mock)
292-
flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, {}, nil).
293-
and_return(mock)
292+
flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, {}, nil)
293+
.and_return(mock)
294294

295295
conn.next_msgid # simulates ongoing query
296296

@@ -303,9 +303,9 @@ def test_queued_read_bind_simple
303303
result2 = make_message(2, app_tag: Net::LDAP::PDU::BindResult)
304304

305305
mock = flexmock("socket")
306-
mock.should_receive(:read_ber).
307-
and_return(result1).
308-
and_return(result2)
306+
mock.should_receive(:read_ber)
307+
.and_return(result1)
308+
.and_return(result2)
309309
mock.should_receive(:write)
310310
conn = Net::LDAP::Connection.new(:socket => mock)
311311

@@ -314,7 +314,8 @@ def test_queued_read_bind_simple
314314
assert result = conn.bind(
315315
method: :simple,
316316
username: "uid=user1,ou=People,dc=rubyldap,dc=com",
317-
password: "passworD1")
317+
password: "passworD1",
318+
)
318319
assert result.success?
319320
assert_equal 2, result.message_id
320321
end
@@ -324,9 +325,9 @@ def test_queued_read_bind_sasl
324325
result2 = make_message(2, app_tag: Net::LDAP::PDU::BindResult)
325326

326327
mock = flexmock("socket")
327-
mock.should_receive(:read_ber).
328-
and_return(result1).
329-
and_return(result2)
328+
mock.should_receive(:read_ber)
329+
.and_return(result1)
330+
.and_return(result2)
330331
mock.should_receive(:write)
331332
conn = Net::LDAP::Connection.new(:socket => mock)
332333

@@ -336,7 +337,8 @@ def test_queued_read_bind_sasl
336337
method: :sasl,
337338
mechanism: "fake",
338339
initial_credential: "passworD1",
339-
challenge_response: flexmock("challenge proc"))
340+
challenge_response: flexmock("challenge proc"),
341+
)
340342
assert result.success?
341343
assert_equal 2, result.message_id
342344
end
@@ -481,8 +483,8 @@ def test_search_net_ldap_connection_event
481483
search_result_ber = Net::BER::BerIdentifiedArray.new([Net::LDAP::ResultCodeSuccess, "", ""])
482484
search_result_ber.ber_identifier = Net::LDAP::PDU::SearchResult
483485
search_result = [1, search_result_ber]
484-
@tcp_socket.should_receive(:read_ber).and_return(search_data).
485-
and_return(search_result)
486+
@tcp_socket.should_receive(:read_ber).and_return(search_data)
487+
.and_return(search_result)
486488

487489
events = @service.subscribe "search.net_ldap_connection"
488490
unread = @service.subscribe "search_messages_unread.net_ldap_connection"

‎test/test_ldif.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,54 @@ def test_ldif_with_version
2222
def test_ldif_with_comments
2323
str = ["# Hello from LDIF-land", "# This is an unterminated comment"]
2424
io = StringIO.new(str[0] + "\r\n" + str[1])
25-
ds = Net::LDAP::Dataset::read_ldif(io)
25+
ds = Net::LDAP::Dataset.read_ldif(io)
2626
assert_equal(str, ds.comments)
2727
end
2828

2929
def test_ldif_with_password
3030
psw = "goldbricks"
31-
hashed_psw = "{SHA}" + Base64::encode64(Digest::SHA1.digest(psw)).chomp
31+
hashed_psw = "{SHA}" + Base64.encode64(Digest::SHA1.digest(psw)).chomp
3232

33-
ldif_encoded = Base64::encode64(hashed_psw).chomp
34-
ds = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: Goldbrick\r\nuserPassword:: #{ldif_encoded}\r\n\r\n"))
33+
ldif_encoded = Base64.encode64(hashed_psw).chomp
34+
ds = Net::LDAP::Dataset.read_ldif(StringIO.new("dn: Goldbrick\r\nuserPassword:: #{ldif_encoded}\r\n\r\n"))
3535
recovered_psw = ds["Goldbrick"][:userpassword].shift
3636
assert_equal(hashed_psw, recovered_psw)
3737
end
3838

3939
def test_ldif_with_continuation_lines
40-
ds = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
40+
ds = Net::LDAP::Dataset.read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
4141
assert_equal(true, ds.key?("abcdefghijklmn"))
4242
end
4343

4444
def test_ldif_with_continuation_lines_and_extra_whitespace
45-
ds1 = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
45+
ds1 = Net::LDAP::Dataset.read_ldif(StringIO.new("dn: abcdefg\r\n hijklmn\r\n\r\n"))
4646
assert_equal(true, ds1.key?("abcdefg hijklmn"))
47-
ds2 = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: abcdefg\r\n hij klmn\r\n\r\n"))
47+
ds2 = Net::LDAP::Dataset.read_ldif(StringIO.new("dn: abcdefg\r\n hij klmn\r\n\r\n"))
4848
assert_equal(true, ds2.key?("abcdefghij klmn"))
4949
end
5050

5151
def test_ldif_tab_is_not_continuation
52-
ds = Net::LDAP::Dataset::read_ldif(StringIO.new("dn: key\r\n\tnotcontinued\r\n\r\n"))
52+
ds = Net::LDAP::Dataset.read_ldif(StringIO.new("dn: key\r\n\tnotcontinued\r\n\r\n"))
5353
assert_equal(true, ds.key?("key"))
5454
end
5555

5656
def test_ldif_with_base64_dn
5757
str = "dn:: Q049QmFzZTY0IGRuIHRlc3QsT1U9VGVzdCxPVT1Vbml0cyxEQz1leGFtcGxlLERDPWNvbQ==\r\n\r\n"
58-
ds = Net::LDAP::Dataset::read_ldif(StringIO.new(str))
58+
ds = Net::LDAP::Dataset.read_ldif(StringIO.new(str))
5959
assert_equal(true, ds.key?("CN=Base64 dn test,OU=Test,OU=Units,DC=example,DC=com"))
6060
end
6161

6262
def test_ldif_with_base64_dn_and_continuation_lines
6363
str = "dn:: Q049QmFzZTY0IGRuIHRlc3Qgd2l0aCBjb250aW51YXRpb24gbGluZSxPVT1UZXN0LE9VPVVua\r\n XRzLERDPWV4YW1wbGUsREM9Y29t\r\n\r\n"
64-
ds = Net::LDAP::Dataset::read_ldif(StringIO.new(str))
64+
ds = Net::LDAP::Dataset.read_ldif(StringIO.new(str))
6565
assert_equal(true, ds.key?("CN=Base64 dn test with continuation line,OU=Test,OU=Units,DC=example,DC=com"))
6666
end
6767

6868
# TODO, INADEQUATE. We need some more tests
6969
# to verify the content.
7070
def test_ldif
7171
File.open(TestLdifFilename, "r") do |f|
72-
ds = Net::LDAP::Dataset::read_ldif(f)
72+
ds = Net::LDAP::Dataset.read_ldif(f)
7373
assert_equal(13, ds.length)
7474
end
7575
end
@@ -84,7 +84,7 @@ def test_to_ldif
8484
entries = data.lines.grep(/^dn:\s*/) { $'.chomp }
8585
dn_entries = entries.dup
8686

87-
ds = Net::LDAP::Dataset::read_ldif(io) do |type, value|
87+
ds = Net::LDAP::Dataset.read_ldif(io) do |type, value|
8888
case type
8989
when :dn
9090
assert_equal(dn_entries.first, value)

0 commit comments

Comments
 (0)