cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup tests to work after changes to user controller

Browse source
This commit is contained in:
Tom Hughes 2010-05-11 14:12:57 +01:00
parent 56aefb8dcd
commit c6609cce24
7 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/fixtures/users.yml vendored
View file

@ -72,7 +72,7 @@ administrator_user:
openid_user: openid_user:
id: 7 id: 7
email: openid-user@example.com email: openid-user@example.com
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2008-05-01 01:23:45" creation_time: "2008-05-01 01:23:45"
display_name: openIDuser display_name: openIDuser

2
test/integration/client_application_test.rb
View file

@ -12,7 +12,7 @@ class ClientApplicationTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test2'} post '/login', {'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'}
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success

2
test/integration/user_blocks_test.rb
View file

@ -42,7 +42,7 @@ class UserBlocksTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[email]' => moderator.email, 'user[password]' => "test", :referer => "/blocks/#{block.id}/revoke"} post '/login', {'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"}
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success

2
test/integration/user_creation_test.rb
View file

@ -134,7 +134,7 @@ class UserCreationTest < ActionController::IntegrationTest
assert_difference('User.count') do assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size', 1) do assert_difference('ActionMailer::Base.deliveries.size', 1) do
post "/user/save", post "/user/save",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser"}} {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
assert_response :redirect assert_response :redirect
res = openid_request(@response.redirected_to) res = openid_request(@response.redirected_to)
post '/user/save', res post '/user/save', res

2
test/integration/user_diaries_test.rb
View file

@ -11,7 +11,7 @@ class UserDiariesTest < ActionController::IntegrationTest
assert_response :success assert_response :success
assert_template 'user/login' assert_template 'user/login'
# We can now login # We can now login
post '/login', {'user[email]' => "test@openstreetmap.org", 'user[password]' => "test", :referer => '/diary/new'} post '/login', {'username' => "test@openstreetmap.org", 'password' => "test", :referer => '/diary/new'}
assert_response :redirect assert_response :redirect
#print @response.body #print @response.body
# Check that there is some payload alerting the user to the redirect # Check that there is some payload alerting the user to the redirect

48
test/integration/user_login_test.rb
View file

@ -9,16 +9,16 @@ class UserLoginTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"} post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"}
assert_response :redirect assert_response :redirect
res = openid_request(@response.redirected_to) res = openid_request(@response.redirected_to)
res2 = post '/login', res res2 = post '/login', res
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success
assert_template 'changeset/list' assert_template 'changeset/list'
end end
def test_login_openid_cancel def test_login_openid_cancel
@ -27,14 +27,16 @@ class UserLoginTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe", :referer => "/diary"} post '/login', {'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"}
assert_response :redirect assert_response :redirect
res = openid_request(@response.redirected_to) res = openid_request(@response.redirected_to)
post '/login', res post '/login', res
assert_response :success assert_response :redirect
assert_template 'login' follow_redirect!
assert_response :success
assert_template 'login'
end end
def test_login_openid_invalid_provider def test_login_openid_invalid_provider
@ -43,10 +45,12 @@ class UserLoginTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
#Use a different port that doesn't have the OpenID provider running on to test an invalid openID #Use a different port that doesn't have the OpenID provider running on to test an invalid openID
post '/login', {'user[openid_url]' => "http://localhost:1124/john.doe", :referer => "/diary"} post '/login', {'openid_url' => "http://localhost:1124/john.doe", :referer => "/diary"}
assert_response :redirect
follow_redirect!
assert_response :success assert_response :success
assert_template 'login' assert_template 'login'
end end
def test_login_openid_invalid_url def test_login_openid_invalid_url
@ -55,10 +59,12 @@ class UserLoginTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
#Use a url with an invalid protocol to make sure it handles that correctly too #Use a url with an invalid protocol to make sure it handles that correctly too
post '/login', {'user[openid_url]' => "htt://localhost:1123/john.doe", :referer => "/diary"} post '/login', {'openid_url' => "htt://localhost:1123/john.doe", :referer => "/diary"}
assert_response :redirect
follow_redirect!
assert_response :success assert_response :success
assert_template 'login' assert_template 'login'
end end
def test_login_openid_unknown def test_login_openid_unknown
@ -67,15 +73,15 @@ class UserLoginTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[openid_url]' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"} post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true_somethingelse", :referer => "/diary"}
assert_response :redirect assert_response :redirect
res = openid_request(@response.redirected_to) res = openid_request(@response.redirected_to)
res2 = post '/login', res res2 = post '/login', res
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success
assert_template 'user/new' assert_template 'user/new'
end end
end end

4
test/integration/user_roles_test.rb
View file

@ -22,7 +22,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"} post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success
@ -40,7 +40,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
follow_redirect! follow_redirect!
assert_response :success assert_response :success
post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"} post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
assert_response :redirect assert_response :redirect
follow_redirect! follow_redirect!
assert_response :success assert_response :success