Merge remote-tracking branch 'openstreetmap/pull/1469'

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index e3ca535206749b860cb7e1d4890aef9580b5629d..8971b7a2b3b12984aa0ee980c73a91c9f5e42768 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,28 +1,27 @@
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest

-  fixtures :users, :client_applications, :gpx_files
-  set_fixture_class :gpx_files => Trace
+  fixtures :users

 
   include OAuth::Helper
 
 
   include OAuth::Helper
 

-  setup do
-    stub_signup_requests
+  def setup
+    stub_hostip_requests

   end
 
   def test_oauth10_web_app
   end
 
   def test_oauth10_web_app

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10_without_callback(client)
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10_without_callback(client)

-    oauth10_with_callback(client, "http://another.web.app.org/callback")
+    oauth10_with_callback(client, "http://another.web.app.example.org/callback")

     oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app
     oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app

-    client = client_applications(:oauth_desktop_app)
+    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success


@@ -32,18 +31,18 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_web_app
   end
 
   def test_oauth10a_web_app

-    client = client_applications(:oauth_web_app)
+    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10a_without_callback(client)
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10a_without_callback(client)

-    oauth10a_with_callback(client, "http://another.web.app.org/callback")
+    oauth10a_with_callback(client, "http://another.web.app.example.org/callback")

     oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app
     oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app

-    client = client_applications(:oauth_desktop_app)
+    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success


@@ -168,7 +167,8 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 

-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => users(:public_user))
+    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token

     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token


@@ -196,7 +196,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)

-      assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
+      assert_redirected_to "http://some.web.app.example.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"

     else
       assert_response :success
       assert_template :authorize_success
     else
       assert_response :success
       assert_template :authorize_success


@@ -230,7 +230,8 @@ class OAuthTest < ActionDispatch::IntegrationTest
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :success
 

-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => users(:public_user))
+    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token

     assert_response :forbidden
 
     post "/oauth/revoke", :token => token.token
     assert_response :forbidden
 
     post "/oauth/revoke", :token => token.token


@@ -278,7 +279,8 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 

-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => users(:public_user))
+    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token

     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token


@@ -333,7 +335,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_equal options[:oauth_callback], token.callback_url
+    assert_equal_allowing_nil options[:oauth_callback], token.callback_url

     assert_allowed token, client.permissions
 
     token
     assert_allowed token, client.permissions
 
     token