X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8399d3e188f2786c7a90661b7c806eb1ee7612b..6b0d4dcab2c72397dbbabd768e47323c0e2e42b2:/test/integration/oauth_test.rb diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 11b874e6b..dd03fde46 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OAuthTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications, :gpx_files @@ -285,7 +285,7 @@ class OAuthTest < ActionDispatch::IntegrationTest :allow_read_prefs => true, :allow_write_prefs => true assert_response :success assert_template "authorize_success" - m = response.body.match("

The verification code is ([A-Za-z0-9]+)

") + m = response.body.match("

The verification code is ([A-Za-z0-9]+).

") assert_not_nil m verifier = m[1] token.reload @@ -328,7 +328,7 @@ private def signed_get(uri, options) uri = URI.parse(uri) uri.scheme ||= "http" - uri.host ||= host + uri.host ||= "www.example.com" helper = OAuth::Client::Helper.new(nil, options) @@ -356,7 +356,7 @@ private params = CGI.parse(URI.parse(response.location).query) assert_not_nil params["oauth_verifier"] - assert_present params["oauth_verifier"].first + assert params["oauth_verifier"].first.present? params["oauth_verifier"].first end