From 705ae93766de6b20aa18a3b40f40065de312e60a Mon Sep 17 00:00:00 2001 From: James Pinto Date: Sat, 21 May 2016 16:43:25 -0300 Subject: [PATCH] Silencing some test warnings --- test/integration/consumer_test.rb | 4 ++-- test/units/test_cli.rb | 4 ++-- test/units/test_consumer.rb | 2 +- test/units/test_net_http_client.rb | 6 +++--- test/units/test_typhoeus_request_proxy.rb | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integration/consumer_test.rb b/test/integration/consumer_test.rb index e0eb3738..b2ccbba2 100644 --- a/test/integration/consumer_test.rb +++ b/test/integration/consumer_test.rb @@ -86,7 +86,7 @@ def test_that_signing_post_params_works assert_equal 'POST', request.method assert_equal '/test', request.path - 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("&") + 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("&")) assert_equal nil, request['authorization'] end @@ -111,7 +111,7 @@ def test_that_signing_post_params_works_2 assert_equal 'POST', request.method assert_equal '/test', request.path - 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("&") + 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("&")) assert_equal nil, request['authorization'] end diff --git a/test/units/test_cli.rb b/test/units/test_cli.rb index 37d1dc7f..2f570804 100644 --- a/test/units/test_cli.rb +++ b/test/units/test_cli.rb @@ -46,13 +46,13 @@ def test_parse def test_help_empty out = run_command - assert_match /Usage: /, out + assert_match(/Usage: /, out) end def test_help out = run_command(%w[help]) - assert_match /Usage: /, out + assert_match(/Usage: /, out) end def test_version diff --git a/test/units/test_consumer.rb b/test/units/test_consumer.rb index b03529fe..c08e8712 100644 --- a/test/units/test_consumer.rb +++ b/test/units/test_consumer.rb @@ -41,7 +41,7 @@ def test_initializer assert_nil @consumer.debug_output end - def test_defaults + def test_defaults @consumer=OAuth::Consumer.new( "key", "secret", diff --git a/test/units/test_net_http_client.rb b/test/units/test_net_http_client.rb index 2de6f6fb..a48a5d9d 100644 --- a/test/units/test_net_http_client.rb +++ b/test/units/test_net_http_client.rb @@ -19,7 +19,7 @@ def test_that_using_auth_headers_on_get_requests_works assert_equal 'GET', request.method assert_equal '/test?key=value', request.path correct_sorted_params = "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"" - auth_intro, auth_params = request['authorization'].split(' ', 2) + auth_intro = request['authorization'].split(' ', 2).first assert_equal auth_intro, 'OAuth' assert_matching_headers correct_sorted_params, request['authorization'] end @@ -129,7 +129,7 @@ def test_that_using_post_params_works assert_equal 'POST', request.method assert_equal '/test', request.path - 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("&") + 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("&")) assert_equal nil, request['authorization'] end @@ -152,7 +152,7 @@ def test_that_using_post_body_works assert_equal 'POST', request.method assert_equal '/test', request.path - 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("&") + 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("&")) # assert_equal nil, request['authorization'] end diff --git a/test/units/test_typhoeus_request_proxy.rb b/test/units/test_typhoeus_request_proxy.rb index 1b8751e0..cf822103 100644 --- a/test/units/test_typhoeus_request_proxy.rb +++ b/test/units/test_typhoeus_request_proxy.rb @@ -61,7 +61,7 @@ def test_that_proxy_simple_put_request_works_with_form_data assert_equal 'PUT', request_proxy.method end - def test_that_proxy_simple_put_request_works_with_arguments + def test_that_proxy_simple_patch_request_works_with_arguments request = Typhoeus::Request.new('/test', :method => :patch) params = {'key' => 'value'} request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params}) @@ -72,7 +72,7 @@ def test_that_proxy_simple_put_request_works_with_arguments assert_equal 'PATCH', request_proxy.method end - def test_that_proxy_simple_put_request_works_with_form_data + def test_that_proxy_simple_patch_request_works_with_form_data request = Typhoeus::Request.new('/test', :method => :patch, :params => {'key' => 'value'}) request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})