jro_apps/redmine Commit - r4101:3a3263102a7c

Refactor: split UsersController#add into #add and #create...

Eric Davis -

r4101:3a3263102a7c

parent child

Context file:

r4101:3a3263102a7c

Collapse all files

app/controllers/users_controller.rb +18 -14

		@@ -72,22 +72,26 class UsersController < ApplicationController
72	72	end
73	73
74	74	def add
75		if request.get?
76		@user = User.new(:language => Setting.default_language)
	75	@user = User.new(:language => Setting.default_language)
	76	@auth_sources = AuthSource.find(:all)
	77	end
	78
	79	verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
	80	def create
	81	@user = User.new(params[:user])
	82	@user.admin = params[:user][:admin] \|\| false
	83	@user.login = params[:user][:login]
	84	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
	85	if @user.save
	86	Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
	87	flash[:notice] = l(:notice_successful_create)
	88	redirect_to(params[:continue] ? {:controller => 'users', :action => 'add'} :
	89	{:controller => 'users', :action => 'edit', :id => @user})
	90	return
77	91	else
78		@user = User.new(params[:user])
79		@user.admin = params[:user][:admin] \|\| false
80		@user.login = params[:user][:login]
81		@user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
82		if @user.save
83		Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
84		flash[:notice] = l(:notice_successful_create)
85		redirect_to(params[:continue] ? {:controller => 'users', :action => 'add'} :
86		{:controller => 'users', :action => 'edit', :id => @user})
87		return
88		end
	92	@auth_sources = AuthSource.find(:all)
	93	render :action => 'add'
89	94	end
90		@auth_sources = AuthSource.find(:all)
91	95	end
92	96
93	97	def edit

app/views/users/add.rhtml +1 -1

              <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=l(:label_user_new)%></h2>
-             <% labelled_tabular_form_for :user, @user, :url => { :action => "add" }, :html => { :class => nil } do |f| %>
+             <% labelled_tabular_form_for :user, @user, :url => { :action => "create" }, :html => { :class => nil } do |f| %>
              	<%= render :partial => 'form', :locals => { :f => f } %>
              	<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
              	<p>

config/routes.rb +1 -1

                  end
                  users.with_options :conditions => {:method => :post} do |user_actions|
                    user_actions.connect 'users', :action => 'add'
-                   user_actions.connect 'users/new', :action => 'add'
+                   user_actions.connect 'users/new', :action => 'create'
                    user_actions.connect 'users/:id/edit', :action => 'edit'
                    user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                    user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'

test/functional/users_controller_test.rb +41 -1

              class UsersControllerTest < ActionController::TestCase
                include Redmine::I18n
-               fixtures :users, :projects, :members, :member_roles, :roles
+               fixtures :users, :projects, :members, :member_roles, :roles, :auth_sources
                def setup
                  @controller = UsersController.new
                  assert project_ids.include?(2) #private project admin can see
                end
+               context "GET :add" do
+                 setup do
+                   get :add
+                 end
+                 should_assign_to :user
+                 should_respond_with :success
+                 should_render_template :add
+               end
+               context "POST :create" do
+                 context "when successful" do
+                   setup do
+                     post :create, :user => {
+                       :firstname => 'John',
+                       :lastname => 'Doe',
+                       :login => 'jdoe',
+                       :password => 'test',
+                       :password_confirmation => 'test',
+                       :mail => 'jdoe@gmail.com'
+                     }
+                   end
+                   should_assign_to :user
+                   should_respond_with :redirect
+                   should_redirect_to('user edit') { {:controller => 'users', :action => 'edit', :id => User.find_by_login('jdoe')}}
+                 end
+                 context "when unsuccessful" do
+                   setup do
+                     post :create, :user => {}
+                   end
+                   should_assign_to :user
+                   should_respond_with :success
+                   should_render_template :add
+                 end
+               end
                def test_edit
                  ActionMailer::Base.deliveries.clear
                  post :edit, :id => 2, :user => {:firstname => 'Changed'}

test/integration/admin_test.rb +2 -2

                  get "/users/add"
                  assert_response :success
                  assert_template "users/add"
-                 post "/users/add", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
+                 post "/users/create", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
                  user = User.find_by_login("psmith")
                  assert_kind_of User, user
                end
                test "Add a user as an anonymous user should fail" do
-                 post '/users/add', :user => { :login => 'psmith', :firstname => 'Paul'}, :password => "psmith09", :password_confirmation => "psmith09"
+                 post '/users/create', :user => { :login => 'psmith', :firstname => 'Paul'}, :password => "psmith09", :password_confirmation => "psmith09"
                  assert_response :redirect
                  assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fusers%2Fnew"
                end

test/integration/routing_test.rb +1 -1

                  should_route :get, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
                  should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
-                 should_route :post, "/users/new", :controller => 'users', :action => 'add'
+                 should_route :post, "/users/new", :controller => 'users', :action => 'create'
                  should_route :post, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
                  should_route :post, "/users/123/memberships", :controller => 'users', :action => 'edit_membership', :id => '123'
                  should_route :post, "/users/123/memberships/55", :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages