Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

[rails.git] / test / functional / user_controller_test.rb

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index 058cab0ecda2904b39c04e1e58fef5405010d33f..1c591f0e63ef733624b15488e9ecdf35abf54ada 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -14,13 +14,13 @@ class UserControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do

-          assert_select "form[action='/user/save'][method=post]", :count => 1 do
+          assert_select "form[action='/user/terms'][method=post]", :count => 1 do

             assert_select "input[id=user_email]", :count => 1
             assert_select "input[id=user_email_confirmation]", :count => 1
             assert_select "input[id=user_display_name]", :count => 1
             assert_select "input[id=user_pass_crypt][type=password]", :count => 1
             assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1
             assert_select "input[id=user_email]", :count => 1
             assert_select "input[id=user_email_confirmation]", :count => 1
             assert_select "input[id=user_display_name]", :count => 1
             assert_select "input[id=user_pass_crypt][type=password]", :count => 1
             assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1

-            assert_select "input[type=submit][value=Signup]", :count => 1
+            assert_select "input[type=submit][value=Continue]", :count => 1

           end
         end
       end
           end
         end
       end


@@ -43,7 +43,7 @@ class UserControllerTest < ActionController::TestCase
     assert_match /#{@url}/, register_email.body
 
     # Check the page
     assert_match /#{@url}/, register_email.body
 
     # Check the page

-    assert_redirected_to :action => 'login'
+    assert_redirected_to :action => 'login', :referer => nil

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


@@ -65,7 +65,7 @@ class UserControllerTest < ActionController::TestCase
   # Check that the user account page will display and contains some relevant
   # information for the user
   def test_view_user_account
   # Check that the user account page will display and contains some relevant
   # information for the user
   def test_view_user_account

-    get :view
+    get :view, {:display_name => "unknown"}

     assert_response :not_found
     
     get :view, {:display_name => "test"}
     assert_response :not_found
     
     get :view, {:display_name => "test"}