X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..b43f9c47145a14b547a900d9559f9aa3fd0895d1:/test/integration/user_creation_test.rb

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index e6ac49e8d..77d73552a 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -10,27 +10,27 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_template 'user/new'
     end
   end
-  
+
   def test_user_create_submit_duplicate_email
     I18n.available_locales.each do |localer|
       dup_email = users(:public_user).email
       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/save',
             {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
             {"accept_language" => localer.to_s}
         end
       end
-      assert_response :success                                                                       
+      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#loginForm > tr > td > div[class=fieldWithErrors] > input#user_email"
+      assert_select "table#signupForm > tr > td > div[class=fieldWithErrors] > input#user_email"
       assert_no_missing_translations
     end
   end
-  
+
   def test_user_create_submit_duplicate_username
     I18n.available_locales.each do |locale|
       dup_display_name = users(:public_user).display_name
@@ -45,38 +45,38 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_response :success
       assert_template 'user/new'
       assert_select "div#errorExplanation"
-      assert_select "table#loginForm > tr > td > div[class=fieldWithErrors] > input#user_display_name"
+      assert_select "table#signupForm > tr > td > div[class=fieldWithErrors] > input#user_display_name"
       assert_no_missing_translations
     end
   end
-  
+
   def test_user_create_success
     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') do
         assert_difference('ActionMailer::Base.deliveries.size', 1) do
-          post_via_redirect "/user/save", 
+          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}"}
         end
       end
-      
+
       # Check the e-mail
       register_email = ActionMailer::Base.deliveries.first
-    
+
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct
       assert_match /#{@url}/, register_email.body
-      
+
       # Check the page
       assert_response :success
       assert_template 'login'
-      
+
       ActionMailer::Base.deliveries.clear
     end
   end
-  
+
   # Check that the user can successfully recover their password
   def lost_password_recovery_success
     # Open the lost password form
@@ -85,4 +85,46 @@ class UserCreationTest < ActionController::IntegrationTest
     # Submit the reset password token
     # Check that the password has changed, and the user can login
   end
+
+  def test_user_create_redirect
+    new_email = "redirect_tester@osm.org"
+    display_name = "redirect_tester"
+    password = "testtest"
+    # nothing special about this page, just need a protected page to redirect back to.
+    referer = "/traces/mine"
+    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 => password, :pass_crypt_confirmation => password}, :referer => referer }
+      end
+    end
+
+    # Check the e-mail
+    register_email = ActionMailer::Base.deliveries.first
+
+    assert_equal register_email.to[0], new_email
+    # Check that the confirm account url is correct
+    confirm_regex = Regexp.new("/user/confirm\\?confirm_string=([a-zA-Z0-9]*)")
+    assert_match(confirm_regex, register_email.body)
+    confirm_string = confirm_regex.match(register_email.body)[1]
+
+    # Check the page
+    assert_response :success
+    assert_template 'login'
+
+    ActionMailer::Base.deliveries.clear
+
+    # Go to the confirmation page
+    get 'user/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/<display_name>/traces
+    follow_redirect!
+    assert_response :success
+    assert_template "trace/list.html.erb"
+  end
 end