X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9cb8311f02e1bd0e2188e3b1db623400aaf8da47..d85fac567be1e2a64fe5737ce1673eca131680af:/test/integration/user_creation_test.rb?ds=inline diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 880fcb30a..179f9eae1 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,38 +1,15 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserCreationTest < ActionController::IntegrationTest +class UserCreationTest < ActionDispatch::IntegrationTest fixtures :users def setup - begin - # Test if the ROTS (Ruby OpenID Test Server) is already running - rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/")) - rescue - # It isn't, so start a new instance. - IO.popen(RAILS_ROOT + "/vendor/gems/rots-0.2.1/bin/rots --silent") - - # Wait for up to 30 seconds for the server to start and respond before continuing - for i in (1 .. 30) - begin - sleep 1 - rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/")) - # If the rescue block doesn't fire, ROTS is up and running and we can continue - break - rescue - # If the connection failed, do nothing and repeat the loop - end - end - end - end - - def teardown - #TODO: The ROTS server needs closing down again at some point, - # but we don't want to do it after every individual test + openid_setup end def test_create_user_form I18n.available_locales.each do |locale| - get '/user/new', {}, {"accept_language" => locale.to_s} + get_via_redirect '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} assert_response :success assert_template 'user/new' end @@ -44,16 +21,15 @@ class UserCreationTest < ActionController::IntegrationTest display_name = "#{localer.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/new', {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, - {"accept_language" => localer.to_s} + {"HTTP_ACCEPT_LANGUAGE" => localer.to_s} end end assert_response :success assert_template 'user/new' assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=fieldWithErrors] > input#user_email" + assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email" assert_no_missing_translations end end @@ -64,15 +40,14 @@ class UserCreationTest < ActionController::IntegrationTest email = "#{locale.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/new', {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, - {"accept_language" => locale.to_s} + {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} end end assert_response :success assert_template 'user/new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=fieldWithErrors] > input#user_display_name" + assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name" assert_no_missing_translations end end @@ -81,11 +56,20 @@ class UserCreationTest < ActionController::IntegrationTest I18n.available_locales.each do |locale| new_email = "#{locale.to_s}newtester@osm.org" display_name = "#{locale.to_s}_new_tester" + + assert_difference('User.count', 0) do + assert_difference('ActionMailer::Base.deliveries.size', 0) do + post "/user/new", + {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} + end + end + + assert_redirected_to "/user/terms" + assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post_via_redirect "/user/save", - {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, - {"accept_language" => "#{locale.to_s}"} + post_via_redirect "/user/save", {}, + {"HTTP_ACCEPT_LANGUAGE" => "#{locale.to_s}"} end end @@ -94,11 +78,11 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct - assert_match /#{@url}/, register_email.body + assert_match /#{@url}/, register_email.body.to_s # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear end @@ -121,10 +105,9 @@ class UserCreationTest < ActionController::IntegrationTest referer = "/traces/mine" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer } - assert_response :success - assert_template 'terms' + assert_redirected_to "/user/terms" post_via_redirect "/user/save", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password} } end @@ -136,27 +119,27 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)") - assert_match(confirm_regex, register_email.body) - confirm_string = confirm_regex.match(register_email.body)[1] + register_email.parts.each do |part| + assert_match confirm_regex, part.body.to_s + end + confirm_string = register_email.parts[0].body.match(confirm_regex)[1] # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear # Go to the confirmation page - get 'user/confirm', { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", { :confirm_string => confirm_string } assert_response :success assert_template 'user/confirm' - post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' } - assert_response :redirect # to trace/mine in original referrer - follow_redirect! - assert_response :redirect # but it not redirects to /user//traces + post "user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success - assert_template "trace/list.html.erb" + assert_template 'site/welcome' end def test_user_create_openid_success @@ -165,13 +148,12 @@ class UserCreationTest < ActionController::IntegrationTest password = "testtest" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {: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 - res = openid_request(@response.redirected_to) - post '/user/terms', res - assert_response :success - assert_template 'terms' + res = openid_request(@response.redirect_url) + get "/user/new", res + assert_redirected_to "/user/terms" 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", :pass_crypt => password, :pass_crypt_confirmation => password}} assert_response :redirect @@ -181,7 +163,7 @@ class UserCreationTest < ActionController::IntegrationTest # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear end @@ -192,11 +174,11 @@ class UserCreationTest < ActionController::IntegrationTest password = "testtest2" assert_difference('User.count',0) do assert_difference('ActionMailer::Base.deliveries.size',0) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}} assert_response :redirect - res = openid_request(@response.redirected_to) - post '/user/terms', res + res = openid_request(@response.redirect_url) + get '/user/new', res assert_response :success assert_template 'user/new' end @@ -213,13 +195,12 @@ class UserCreationTest < ActionController::IntegrationTest referer = "/traces/mine" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {: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 => ""}, :referer => referer } - assert_response :redirect + assert_response :redirect res = openid_request(@response.location) - post '/user/terms', res - assert_response :success - assert_template 'terms' + get "/user/new", res + assert_redirected_to "/user/terms" post_via_redirect "/user/save", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} } end @@ -231,26 +212,26 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)") - assert_match(confirm_regex, register_email.body) - confirm_string = confirm_regex.match(register_email.body)[1] + register_email.parts.each do |part| + assert_match confirm_regex, part.body.to_s + end + confirm_string = register_email.parts[0].body.match(confirm_regex)[1] # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear # Go to the confirmation page - get 'user/confirm', { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", { :confirm_string => confirm_string } assert_response :success assert_template 'user/confirm' - post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' } - assert_response :redirect # to trace/mine in original referrer - follow_redirect! - assert_response :redirect # but it not redirects to /user//traces + post "/user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success - assert_template "trace/list.html.erb" + assert_template 'site/welcome' end end