X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58cd5bfb11bccb5e326847b218809be2c93a00d5..4729163aa8e9bf6a7c9f12a8fcd77e6b632e9d80:/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 9945bd886..179f9eae1 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserCreationTest < ActionController::IntegrationTest +class UserCreationTest < ActionDispatch::IntegrationTest fixtures :users def setup @@ -29,7 +29,6 @@ class UserCreationTest < ActionController::IntegrationTest 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 "form > fieldset > div.form-row > div.field_with_errors > input#user_email" assert_no_missing_translations end @@ -48,7 +47,6 @@ class UserCreationTest < ActionController::IntegrationTest end assert_response :success assert_template 'user/new' - assert_select "div#errorExplanation" assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name" assert_no_missing_translations end @@ -84,7 +82,7 @@ class UserCreationTest < ActionController::IntegrationTest # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear end @@ -128,17 +126,17 @@ class UserCreationTest < ActionController::IntegrationTest # 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 + post "user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success assert_template 'site/welcome' @@ -165,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 @@ -221,17 +219,17 @@ class UserCreationTest < ActionController::IntegrationTest # 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 + post "/user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success assert_template 'site/welcome'