Add support for conditional deletes in changeset uploads

[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 5c1d6f47eb2d4743a5b80a3a149ccd7d6c2e53a1..cbe66a0dbee43a1230abd579cdbe97e923419896 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
-          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[type=submit][value=Signup]", :count => 1
+            assert_select "input[type=submit][value=Continue]", :count => 1
           end
         end
       end
@@ -59,13 +59,13 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success                                                                       
     assert_template 'new'
     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"
   end
   
   # 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"}