Use the standard ruby instance_methods call

[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 f756b0514a55d60159bb1287130936b321d4184c..7761c0c7e30f1563fe7ced1cb2890d3bec38a24c 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -6,6 +6,10 @@ class UserControllerTest < ActionController::TestCase
   ##
   # test all routes which lead to this controller
   def test_routes
+    assert_routing(
+      { :path => "/api/0.6/user/1", :method => :get },
+      { :controller => "user", :action => "api_read", :id => "1" }
+    )
     assert_routing(
       { :path => "/api/0.6/user/details", :method => :get },
       { :controller => "user", :action => "api_details" }
@@ -186,8 +190,12 @@ class UserControllerTest < ActionController::TestCase
   # The user creation page loads
   def test_user_create_view
     get :new
+    assert_response :redirect
+    assert_redirected_to user_new_path(:cookie_test => "true")
+
+    get :new, { :cookie_test => "true" }, { :cookie_test => true }
     assert_response :success
-    
+
     assert_select "html", :count => 1 do
       assert_select "head", :count => 1 do
         assert_select "title", :text => /Create account/, :count => 1
@@ -212,7 +220,13 @@ class UserControllerTest < ActionController::TestCase
     display_name = "new_tester"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size') do
-        post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}
+        session[:new_user] = User.new({
+          :status => "pending", :display_name => display_name,
+          :email => new_email, :email_confirmation => new_email, 
+          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
+        }, :without_protection => true)
+
+        post :save
       end
     end
       
@@ -233,13 +247,19 @@ class UserControllerTest < ActionController::TestCase
     display_name = "new_tester"
     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+        session[:new_user] = User.new({
+          :status => "pending", :display_name => display_name,
+          :email => email, :email_confirmation => email, 
+          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
+        }, :without_protection => true)
+
+        post :save
       end
     end
     assert_response :success                                                                       
     assert_template 'new'
     assert_select "div#errorExplanation"
-    assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email"
+    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
   end
   
   def test_user_create_submit_duplicate_email_uppercase
@@ -247,13 +267,19 @@ class UserControllerTest < ActionController::TestCase
     display_name = "new_tester"
     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+        session[:new_user] = User.new({
+          :status => "pending", :display_name => display_name,
+          :email => email, :email_confirmation => email, 
+          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
+        }, :without_protection => true)
+
+        post :save
       end
     end
     assert_response :success                                                                       
     assert_template 'new'
     assert_select "div#errorExplanation"
-    assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email"
+    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
   end
     
   def test_user_create_submit_duplicate_name
@@ -261,13 +287,19 @@ class UserControllerTest < ActionController::TestCase
     display_name = users(:public_user).display_name
     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+        session[:new_user] = User.new({
+          :status => "pending", :display_name => display_name,
+          :email => email, :email_confirmation => email, 
+          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
+        }, :without_protection => true)
+
+        post :save
       end
     end
     assert_response :success                                                                       
     assert_template 'new'
     assert_select "div#errorExplanation"
-    assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name"
+    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
   end
   
   def test_user_create_submit_duplicate_name_uppercase
@@ -275,13 +307,19 @@ class UserControllerTest < ActionController::TestCase
     display_name = users(:public_user).display_name.upcase
     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+        session[:new_user] = User.new({
+          :status => "pending", :display_name => display_name,
+          :email => email, :email_confirmation => email, 
+          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
+        }, :without_protection => true)
+
+        post :save
       end
     end
     assert_response :success                                                                       
     assert_template 'new'
     assert_select "div#errorExplanation"
-    assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name"
+    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
   end
 
   def test_user_lost_password
@@ -375,7 +413,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select "div#notice", /^User information updated successfully/
-    assert_select "table#accountForm > tr > td > div#user_description_container > div#user_description_content > textarea#user_description", user.description
+    assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
 
     # Changing name to one that exists should fail
     user.display_name = users(:public_user).display_name
@@ -384,7 +422,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#notice", false
     assert_select "div#errorExplanation"
-    assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name"
+    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
 
     # Changing name to one that exists should fail, regardless of case
     user.display_name = users(:public_user).display_name.upcase
@@ -393,7 +431,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#notice", false
     assert_select "div#errorExplanation"
-    assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name"
+    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
 
     # Changing name to one that doesn't exist should work
     user.display_name = "new tester"
@@ -402,7 +440,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select "div#notice", /^User information updated successfully/
-    assert_select "table#accountForm > tr > td > input#user_display_name[value=?]", user.display_name
+    assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", user.display_name
 
     # Need to update cookies now to stay valid
     @request.cookies["_osm_username"] = user.display_name
@@ -414,7 +452,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#notice", false
     assert_select "div#errorExplanation"
-    assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email"
+    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = users(:public_user).email.upcase
@@ -423,7 +461,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#notice", false
     assert_select "div#errorExplanation"
-    assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email"
+    assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"
@@ -432,7 +470,7 @@ class UserControllerTest < ActionController::TestCase
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_select "div#notice", /^User information updated successfully/
-    assert_select "table#accountForm > tr > td > input#user_new_email[value=?]", user.new_email
+    assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
   end
   
   # Check that the user account page will display and contains some relevant
@@ -520,7 +558,30 @@ class UserControllerTest < ActionController::TestCase
       assert_select "a[href=/blocks/new/test]", 1
     end
   end
-  
+
+  def test_user_api_read
+    # check that a visible user is returned properly
+    get :api_read, :id => users(:normal_user).id
+    assert_response :success
+
+    # check that we aren't revealing private information
+    assert_select "contributor-terms[pd]", false
+    assert_select "home", false
+    assert_select "languages", false
+
+    # check that a suspended user is not returned
+    get :api_read, :id => users(:suspended_user).id
+    assert_response :gone
+
+    # check that a deleted user is not returned
+    get :api_read, :id => users(:deleted_user).id
+    assert_response :gone
+
+    # check that a non-existent user is not returned
+    get :api_read, :id => 0
+    assert_response :not_found
+  end
+
   def test_user_api_details
     get :api_details
     assert_response :unauthorized