added user func test

app/controllers/users_controller.rb

@@ -1,40 +1,44 @@
 class UsersController < ApplicationController
   respond_to :html, :xml, :json
-  before_filter :member_only, :only => [:edit, :show, :update, :destroy]
+  before_filter :member_only, :only => [:edit, :update]
+  rescue_from User::PrivilegeError, :with => "static/access_denied"
 
   def new
     @user = User.new
+    respond_with(@user)
   end
   
   def edit
     @user = User.find(params[:id])
-    unless CurrentUser.user.is_admin?
+    check_privilege(@user)
-      @user = CurrentUser.user
+    respond_with(@user)
-    end
   end
   
   def index
+    @search = User.search(params[:search])
+    @users = @search.paginate(:page => params[:page])
+    respond_with(@users)
   end
   
   def show
     @user = User.find(params[:id])
+    respond_with(@user)
   end
   
   def create
-    @user = User.new(params[:user].merge(:ip_addr => request.remote_ip))
+    @user = User.create(params[:user])
-    if @user.save
+    respond_with(@user)
-      flash[:notice] = "You have succesfully created a new account"
-      session[:user_id] = @user.id
-      redirect_to user_path(@user)
-    else
-      flash[:notice] = "There were errors"
-      render :action => "new"
-    end
   end
   
   def update
+    @user = User.find(params[:id])
+    check_privilege(@user)
+    @user.update_attributes(params[:user])
+    respond_with(@user)
   end
-  
+
-  def destroy
+private
+  def check_privilege(user)
+    raise User::PrivilegeError unless (user.id == CurrentUser.id || CurrentUser.is_admin?)
   end
 end

app/models/user.rb

@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   class Error < Exception ; end
   class PrivilegeError < Exception ; end
   
-  attr_accessor :password, :old_password, :ip_addr
+  attr_accessor :password, :old_password
   attr_accessible :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr
   validates_length_of :name, :within => 2..20, :on => :create
   validates_format_of :name, :with => /\A[^\s;,]+\Z/, :on => :create, :message => "cannot have whitespace, commas, or semicolons"
@@ -14,7 +14,6 @@ class User < ActiveRecord::Base
   validates_inclusion_of :default_image_size, :in => %w(medium large original)
   validates_confirmation_of :password
   validates_presence_of :email, :if => lambda {|rec| rec.new_record? && Danbooru.config.enable_email_verification?}
-  validates_presence_of :ip_addr, :on => :create
   validate :validate_ip_addr_is_not_banned, :on => :create
   before_save :encrypt_password
   after_save :update_cache
@@ -31,7 +30,7 @@ class User < ActiveRecord::Base
   
   module BanMethods
     def validate_ip_addr_is_not_banned
-      if IpBan.is_banned?(ip_addr)
+      if IpBan.is_banned?(CurrentUser.ip_addr)
         self.errors[:base] << "IP address is banned"
         return false
       end

test/factories/user.rb

@@ -5,7 +5,6 @@ Factory.define(:user) do |f|
   f.email {Faker::Internet.email}
   f.default_image_size "medium"
   f.base_upload_limit 10
-  f.ip_addr "127.0.0.1"
 end
 
 Factory.define(:banned_user, :parent => :user) do |f|

test/functional/users_controller_test.rb

@@ -1,8 +1,75 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
+  context "The users controller" do
-  test "the truth" do
+    setup do
-    assert true
+      @user = Factory.create(:user)
+      CurrentUser.user = @user
+      CurrentUser.ip_addr = "127.0.0.1"
+    end
+    
+    teardown do
+      CurrentUser.user = nil
+    end
+    
+    context "index action" do
+      setup do
+        Factory.create(:user, :name => "abc")
+      end
+      
+      should "list all users" do
+        get :index
+        assert_response :success
+      end
+      
+      should "list all users (with search)" do
+        get :index, {:search => {:name_matches => "abc"}}
+        assert_response :success
+      end
+    end
+    
+    context "show action" do
+      setup do
+        @user = Factory.create(:user)
+      end
+      
+      should "render" do
+        get :show, {:id => @user.id}
+        assert_response :success
+      end
+    end
+    
+    context "create action" do
+      should "create a user" do
+        assert_difference("User.count", 1) do
+          post :create, {:user => {:name => "xxx", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}, {:user_id => @user.id}
+          assert_not_nil(assigns(:user))
+          assert_equal([], assigns(:user).errors.full_messages)
+        end
+      end
+    end
+    
+    context "edit action" do
+      setup do
+        @user = Factory.create(:user)
+      end
+      
+      should "render" do
+        get :edit, {:id => @user.id}, {:user_id => @user.id}
+        assert_response :success
+      end
+    end
+    
+    context "update action" do
+      setup do
+        @user = Factory.create(:user)
+      end
+      
+      should "update a user" do
+        post :update, {:id => @user.id, :user => {:name => "xyz"}}, {:user_id => @user.id}
+        @user.reload
+        assert_equal("xyz", @user.name)
+      end
+    end
   end
 end