Skip to content

Commit a670c12

Browse files
committed
Use assert_nil so as to silence a Minitest 6 deprecation warning
1 parent 00e8650 commit a670c12

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

test/integration/consumer_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_that_signing_post_params_works
8787
assert_equal 'POST', request.method
8888
assert_equal '/test', request.path
8989
assert_match(/key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3[Dd]&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0/, request.body.split("&").sort.join("&"))
90-
assert_equal nil, request['authorization']
90+
assert_nil request['authorization']
9191
end
9292

9393
def test_that_using_auth_headers_on_get_on_create_signed_requests_works
@@ -112,7 +112,7 @@ def test_that_signing_post_params_works_2
112112
assert_equal 'POST', request.method
113113
assert_equal '/test', request.path
114114
assert_match(/key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3[Dd]&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0/, request.body.split("&").sort.join("&"))
115-
assert_equal nil, request['authorization']
115+
assert_nil request['authorization']
116116
end
117117

118118
def test_step_by_step_token_request
@@ -136,7 +136,7 @@ def test_step_by_step_token_request
136136
@consumer.sign!(request, nil,options)
137137

138138
assert_equal 'GET', request.method
139-
assert_equal nil, request.body
139+
assert_nil request.body
140140
response=@consumer.http.request(request)
141141
assert_equal "200",response.code
142142
assert_equal "oauth_token=requestkey&oauth_token_secret=requestsecret",response.body

test/units/test_net_http_client.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ def test_that_using_get_params_works
105105
assert_equal 'GET', request.method
106106
uri = URI.parse(request.path)
107107
assert_equal '/test', uri.path
108-
assert_equal nil, uri.fragment
108+
assert_nil uri.fragment
109109
assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=1oO2izFav1GP4kEH2EskwXkCRFg%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
110-
assert_equal nil, request['authorization']
110+
assert_nil request['authorization']
111111
end
112112

113113
def test_that_using_get_params_works_with_plaintext
@@ -117,9 +117,9 @@ def test_that_using_get_params_works_with_plaintext
117117
assert_equal 'GET', request.method
118118
uri = URI.parse(request.path)
119119
assert_equal '/test', uri.path
120-
assert_equal nil, uri.fragment
120+
assert_nil uri.fragment
121121
assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=5888bf0345e5d237%263196ffd991c8ebdb&oauth_signature_method=PLAINTEXT&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
122-
assert_equal nil, request['authorization']
122+
assert_nil request['authorization']
123123
end
124124

125125
def test_that_using_post_params_works
@@ -130,7 +130,7 @@ def test_that_using_post_params_works
130130
assert_equal 'POST', request.method
131131
assert_equal '/test', request.path
132132
assert_match(/key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3[Dd]&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0/, request.body.split("&").sort.join("&"))
133-
assert_equal nil, request['authorization']
133+
assert_nil request['authorization']
134134
end
135135

136136
def test_that_using_post_params_works_with_plaintext
@@ -141,7 +141,7 @@ def test_that_using_post_params_works_with_plaintext
141141
assert_equal 'POST', request.method
142142
assert_equal '/test', request.path
143143
assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=5888bf0345e5d237%263196ffd991c8ebdb&oauth_signature_method=PLAINTEXT&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", request.body.split("&").sort.join("&")
144-
assert_equal nil, request['authorization']
144+
assert_nil request['authorization']
145145
end
146146

147147
def test_that_using_post_body_works
@@ -153,7 +153,7 @@ def test_that_using_post_body_works
153153
assert_equal 'POST', request.method
154154
assert_equal '/test', request.path
155155
assert_match(/OAuth oauth_consumer_key="consumer_key_86cad9", oauth_nonce="225579211881198842005988698334675835446", oauth_signature="%2[fF]DMMBOJzQ6JmEaXlAXDLGtD1z2I%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1199645624", oauth_token="token_411a7f", oauth_version="1.0"/, request['authorization'].split("&").sort.join("&"))
156-
# assert_equal nil, request['authorization']
156+
# assert_nil request['authorization']
157157
end
158158

159159
def test_that_using_post_with_uri_params_works
@@ -164,10 +164,10 @@ def test_that_using_post_with_uri_params_works
164164
assert_equal 'POST', request.method
165165
uri = URI.parse(request.path)
166166
assert_equal '/test', uri.path
167-
assert_equal nil, uri.fragment
167+
assert_nil uri.fragment
168168
assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
169169
assert_equal "", request.body
170-
assert_equal nil, request['authorization']
170+
assert_nil request['authorization']
171171
end
172172

173173
def test_that_using_post_with_uri_and_form_params_works
@@ -178,10 +178,10 @@ def test_that_using_post_with_uri_and_form_params_works
178178
assert_equal 'POST', request.method
179179
uri = URI.parse(request.path)
180180
assert_equal '/test', uri.path
181-
assert_equal nil, uri.fragment
181+
assert_nil uri.fragment
182182
assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=4kSU8Zd1blWo3W6qJH7eaRTMkg0%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
183183
assert_equal "key2=value2", request.body
184-
assert_equal nil, request['authorization']
184+
assert_nil request['authorization']
185185
end
186186

187187
def test_that_using_post_with_uri_and_data_works
@@ -193,11 +193,11 @@ def test_that_using_post_with_uri_and_data_works
193193
assert_equal 'POST', request.method
194194
uri = URI.parse(request.path)
195195
assert_equal '/test', uri.path
196-
assert_equal nil, uri.fragment
196+
assert_nil uri.fragment
197197
assert_equal "data", request.body
198198
assert_equal 'text/ascii', request.content_type
199199
assert_equal "key=value&oauth_body_hash=oXyaqmHoChv3HQ2FCvTluqmAC70%3D&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=MHRKU42iVHU4Ke9kBUDa9Zw6IAM%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
200-
assert_equal nil, request['authorization']
200+
assert_nil request['authorization']
201201
end
202202

203203

0 commit comments

Comments
 (0)