Cleanup trailing whitespace

[rails.git] / test / integration / oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 8639c8e53ed4910b6521a1044f97346b457396c4..da8738b4291246982ddd55f875bf7fd58d6b241f 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class OAuthTest < ActionController::IntegrationTest
-  fixtures :users, :client_applications
+class OAuthTest < ActionDispatch::IntegrationTest
+  fixtures :users, :client_applications, :gpx_files
 
   include OAuth::Helper
 
   def test_oauth10_web_app
     client = client_applications(:oauth_web_app)
 
-    post_via_redirect "/login", 
+    post_via_redirect "/login",
       :username => client.user.email, :password => "test"
     assert_response :success
 
@@ -21,8 +21,8 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
+    post "/oauth/authorize",
+      :oauth_token => token.token,
       :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :redirect
     assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}"
@@ -65,9 +65,9 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :oauth_callback => "http://another.web.app.org/callback", 
+    post "/oauth/authorize",
+      :oauth_token => token.token,
+      :oauth_callback => "http://another.web.app.org/callback",
       :allow_write_api => true, :allow_read_gpx => true
     assert_response :redirect
     assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}"
@@ -105,7 +105,7 @@ class OAuthTest < ActionController::IntegrationTest
   def test_oauth10_desktop_app
     client = client_applications(:oauth_desktop_app)
 
-    post_via_redirect "/login", 
+    post_via_redirect "/login",
       :username => client.user.email, :password => "test"
     assert_response :success
 
@@ -118,8 +118,8 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
+    post "/oauth/authorize",
+      :oauth_token => token.token,
       :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :success
     assert_template "authorize_success"
@@ -266,7 +266,7 @@ class OAuthTest < ActionController::IntegrationTest
   def test_oauth10a_desktop_app
     client = client_applications(:oauth_desktop_app)
 
-    post_via_redirect "/login", 
+    post_via_redirect "/login",
       :username => client.user.email, :password => "test"
     assert_response :success
 
@@ -280,12 +280,12 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, client.permissions
 
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
+    post "/oauth/authorize",
+      :oauth_token => token.token,
       :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :success
     assert_template "authorize_success"
-    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+)</p>")
+    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+).</p>")
     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