Merge remote-tracking branch 'origin/master' into routing

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

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index c565afd1ed132961f2ae4f49175b3995f7c0d275..503160e9daa6c8095ebd9488d0fd4b2ab306e9d1 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'

 
 

-class UserCreationTest < ActionController::IntegrationTest
+class UserCreationTest < ActionDispatch::IntegrationTest

   fixtures :users
 
   def setup
   fixtures :users
 
   def setup


@@ -29,8 +29,7 @@ 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_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 "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"

       assert_no_missing_translations
     end
   end
       assert_no_missing_translations
     end
   end


@@ -48,8 +47,7 @@ class UserCreationTest < ActionController::IntegrationTest
       end
       assert_response :success
       assert_template 'user/new'
       end
       assert_response :success
       assert_template 'user/new'

-      assert_select "div#errorExplanation"
-      assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"

       assert_no_missing_translations
     end
   end
       assert_no_missing_translations
     end
   end


@@ -84,7 +82,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
       # Check the page
       assert_response :success
 
       # Check the page
       assert_response :success

-      assert_template 'login'
+      assert_template 'user/confirm'

 
       ActionMailer::Base.deliveries.clear
     end
 
       ActionMailer::Base.deliveries.clear
     end


@@ -128,22 +126,20 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
 
     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'
 
     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
+    post "user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    assert_response :redirect

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template 'trace/list'
+    assert_template 'site/welcome'

   end
 
   def test_user_create_openid_success
   end
 
   def test_user_create_openid_success


@@ -167,7 +163,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -223,21 +219,19 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
 
     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'
 
     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
+    post "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    assert_response :redirect

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "trace/list"
+    assert_template 'site/welcome'

   end
 end
   end
 end