Update bundle

[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 9cf48f4707c01ada7f43efa121dc977102b6aa9f..d4121c1bd495765a478d7cdee90c5258eb115f31 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -49,10 +49,6 @@ class UserControllerTest < ActionController::TestCase
       { :path => "/user/new", :method => :get },
       { :controller => "user", :action => "new" }
     )
       { :path => "/user/new", :method => :get },
       { :controller => "user", :action => "new" }
     )

-    assert_recognizes(
-      { :controller => "user", :action => "new" },
-      { :path => "/create-account.html", :method => :get }
-    )

 
     assert_routing(
       { :path => "/user/new", :method => :post },
 
     assert_routing(
       { :path => "/user/new", :method => :post },


@@ -112,10 +108,6 @@ class UserControllerTest < ActionController::TestCase
       { :path => "/user/forgot-password", :method => :post },
       { :controller => "user", :action => "lost_password" }
     )
       { :path => "/user/forgot-password", :method => :post },
       { :controller => "user", :action => "lost_password" }
     )

-    assert_recognizes(
-      { :controller => "user", :action => "lost_password" },
-      { :path => "/forgot-password.html", :method => :get }
-    )

     assert_routing(
       { :path => "/user/reset-password", :method => :get },
       { :controller => "user", :action => "reset_password" }
     assert_routing(
       { :path => "/user/reset-password", :method => :get },
       { :controller => "user", :action => "reset_password" }


@@ -351,17 +343,12 @@ class UserControllerTest < ActionController::TestCase
   def test_user_terms_seen
     user = users(:normal_user)
 
   def test_user_terms_seen
     user = users(:normal_user)
 

-    # Set the username cookie
-    @request.cookies["_osm_username"] = user.display_name
-

     get :terms, {}, { "user" => user }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
   end
 
   def test_user_go_public
     get :terms, {}, { "user" => user }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => user.display_name
   end
 
   def test_user_go_public

-    @request.cookies["_osm_username"] = users(:normal_user).display_name
-

     post :go_public, {}, { :user => users(:normal_user) }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name
     post :go_public, {}, { :user => users(:normal_user) }
     assert_response :redirect
     assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name


@@ -402,7 +389,7 @@ class UserControllerTest < ActionController::TestCase
     end
     assert_response :success
     assert_template :lost_password
     end
     assert_response :success
     assert_template :lost_password

-    assert_select "div#error", /^Could not find that email address/
+    assert_select ".error", /^Could not find that email address/

 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique
 
     # Test resetting using the address as recorded for a user that has an
     # address which is case insensitively unique


@@ -460,20 +447,15 @@ class UserControllerTest < ActionController::TestCase
     # validation errors being reported
     user = users(:normal_user)
 
     # validation errors being reported
     user = users(:normal_user)
 

-    # Set the username cookie
-    @request.cookies["_osm_username"] = user.display_name
-

     # Make sure that you are redirected to the login page when
     # you are not logged in
     get :account, { :display_name => user.display_name }
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
 
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get :account, { :display_name => user.display_name }
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
 

-    # Make sure that you are redirected to the login page when
-    # you are not logged in as the right user
+    # Make sure that you are blocked when not logged in as the right user

     get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id }
     get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id }

-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account"
+    assert_response :forbidden

 
     # Make sure we get the page when we are logged in as the right user
     get :account, { :display_name => user.display_name }, { "user" => user }
 
     # Make sure we get the page when we are logged in as the right user
     get :account, { :display_name => user.display_name }, { "user" => user }


@@ -486,45 +468,45 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
+    assert_select ".notice", /^User information updated successfully/

     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
     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
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name)
+    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     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
     assert_select "div#errorExplanation"
     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
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase)
+    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     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
     assert_select "div#errorExplanation"
     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"
-    post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
+    new_attributes = user.attributes.dup.merge(:display_name => "new tester")
+    post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id }

     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
-    assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", user.display_name
+    assert_select ".notice", /^User information updated successfully/
+    assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester"

 
 

-    # Need to update cookies now to stay valid
-    @request.cookies["_osm_username"] = user.display_name
+    # Record the change of name
+    user.display_name = "new tester"

 
     # Changing email to one that exists should fail
     user.new_email = users(:public_user).email
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
 
     # Changing email to one that exists should fail
     user.new_email = users(:public_user).email
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 
     assert_select "div#errorExplanation"
     assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 


@@ -533,7 +515,7 @@ class UserControllerTest < ActionController::TestCase
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account
     post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id }
     assert_response :success
     assert_template :account

-    assert_select "div#notice", false
+    assert_select ".notice", false

     assert_select "div#errorExplanation"
     assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 
     assert_select "div#errorExplanation"
     assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email"
 


@@ -543,7 +525,7 @@ class UserControllerTest < ActionController::TestCase
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false

-    assert_select "div#notice", /^User information updated successfully/
+    assert_select ".notice", /^User information updated successfully/

     assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
   end
   
     assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email
   end
   


@@ -558,7 +540,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1


@@ -572,7 +554,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "blocked"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "blocked"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/blocked/edits]", 1
+      assert_select "a[href^=/user/blocked/history]", 1

       assert_select "a[href=/user/blocked/traces]", 1
       assert_select "a[href=/user/blocked/diary]", 1
       assert_select "a[href=/user/blocked/diary/comments]", 1
       assert_select "a[href=/user/blocked/traces]", 1
       assert_select "a[href=/user/blocked/diary]", 1
       assert_select "a[href=/user/blocked/diary/comments]", 1


@@ -586,7 +568,7 @@ class UserControllerTest < ActionController::TestCase
     get :view, {:display_name => "moderator"}
     assert_response :success
     assert_select "div#userinformation" do
     get :view, {:display_name => "moderator"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/moderator/edits]", 1
+      assert_select "a[href^=/user/moderator/history]", 1

       assert_select "a[href=/user/moderator/traces]", 1
       assert_select "a[href=/user/moderator/diary]", 1
       assert_select "a[href=/user/moderator/diary/comments]", 1
       assert_select "a[href=/user/moderator/traces]", 1
       assert_select "a[href=/user/moderator/diary]", 1
       assert_select "a[href=/user/moderator/diary/comments]", 1


@@ -598,13 +580,12 @@ class UserControllerTest < ActionController::TestCase
 
     # Login as a normal user
     session[:user] = users(:normal_user).id
 
     # Login as a normal user
     session[:user] = users(:normal_user).id

-    cookies["_osm_username"] = users(:normal_user).display_name

 
     # Test the normal user
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
 
     # Test the normal user
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/traces/mine]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/traces/mine]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1


@@ -616,13 +597,12 @@ class UserControllerTest < ActionController::TestCase
 
     # Login as a moderator
     session[:user] = users(:moderator_user).id
 
     # Login as a moderator
     session[:user] = users(:moderator_user).id

-    cookies["_osm_username"] = users(:moderator_user).display_name

 
     # Test the normal user
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do
 
     # Test the normal user
     get :view, {:display_name => "test"}
     assert_response :success
     assert_select "div#userinformation" do

-      assert_select "a[href=/user/test/edits]", 1
+      assert_select "a[href^=/user/test/history]", 1

       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1
       assert_select "a[href=/user/test/traces]", 1
       assert_select "a[href=/user/test/diary]", 1
       assert_select "a[href=/user/test/diary/comments]", 1


@@ -734,9 +714,6 @@ class UserControllerTest < ActionController::TestCase
     # Check that the users aren't already friends
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # Check that the users aren't already friends
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 

-    # Set the username cookie
-    @request.cookies["_osm_username"] = user.display_name
-

     # When not logged in a GET should ask us to login
     get :make_friend, {:display_name => friend.display_name}
     assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
     # When not logged in a GET should ask us to login
     get :make_friend, {:display_name => friend.display_name}
     assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name)


@@ -787,9 +764,6 @@ class UserControllerTest < ActionController::TestCase
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 

-    # Set the username cookie
-    @request.cookies["_osm_username"] = user.display_name
-

     # When not logged in a GET should ask us to login
     get :remove_friend, {:display_name => friend.display_name}
     assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
     # When not logged in a GET should ask us to login
     get :remove_friend, {:display_name => friend.display_name}
     assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)


@@ -831,4 +805,51 @@ class UserControllerTest < ActionController::TestCase
     assert_match /is not one of your friends/, flash[:error]
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end
     assert_match /is not one of your friends/, flash[:error]
     assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
   end

+
+  def test_set_status
+    # Try without logging in
+    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended")
+
+    # Now try as a normal user
+    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+    # Finally try as an administrator
+    get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+    assert_equal "suspended", User.find(users(:normal_user).id).status
+  end
+
+  def test_delete
+    # Try without logging in
+    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}
+    assert_response :redirect
+    assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended")
+
+    # Now try as a normal user
+    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+    # Finally try as an administrator
+    get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name
+
+    # Check that the user was deleted properly
+    user = User.find(users(:normal_user).id)
+    assert_equal "user_1", user.display_name
+    assert_equal "", user.description
+    assert_nil user.home_lat
+    assert_nil user.home_lon
+    assert_equal false, user.image.file?
+    assert_equal false, user.email_valid
+    assert_nil user.new_email
+    assert_nil user.openid_url
+    assert_equal "deleted", user.status
+  end

 end
 end