From 502aeb6a16c3b2a6a9ca182cdd694b204b8f32ae Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 2 Feb 2011 15:53:28 -0500 Subject: [PATCH] added user func test --- app/controllers/users_controller.rb | 34 ++++++----- app/models/user.rb | 5 +- app/views/users/index.html.erb | 0 test/factories/user.rb | 1 - test/functional/users_controller_test.rb | 73 +++++++++++++++++++++++- 5 files changed, 91 insertions(+), 22 deletions(-) create mode 100644 app/views/users/index.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 85b0c1f25..bf958e357 100644 --- a/app/controllers/users_controller.rb +++ b/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? - @user = CurrentUser.user - end + check_privilege(@user) + respond_with(@user) 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)) - if @user.save - 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 + @user = User.create(params[:user]) + respond_with(@user) 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 diff --git a/app/models/user.rb b/app/models/user.rb index 54de171c7..37afeee69 100644 --- a/app/models/user.rb +++ b/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 diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/test/factories/user.rb b/test/factories/user.rb index 85c8d523d..1fcc68dff 100644 --- a/test/factories/user.rb +++ b/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| diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index c3db1230a..d020de189 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -1,8 +1,75 @@ require 'test_helper' class UsersControllerTest < ActionController::TestCase - # Replace this with your real tests. - test "the truth" do - assert true + context "The users controller" do + setup do + @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