From 92ec35e6570bffea85ba2669146b7c4fd63f109d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 Oct 2009 18:48:19 +0000
Subject: [PATCH] Unified UsersController#list and #index.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2991 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/controllers/users_controller.rb | 7 +----
app/views/users/{list.rhtml => index.rhtml} | 0
config/routes.rb | 1 -
test/functional/users_controller_test.rb | 31 ++++++++++-----------
4 files changed, 16 insertions(+), 23 deletions(-)
rename app/views/users/{list.rhtml => index.rhtml} (100%)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 71ceb758f..05dc5bc59 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -24,11 +24,6 @@ class UsersController < ApplicationController
include CustomFieldsHelper
def index
- list
- render :action => 'list' unless request.xhr?
- end
-
- def list
sort_init 'login', 'asc'
sort_update %w(login firstname lastname mail admin created_on last_login_on)
@@ -49,7 +44,7 @@ class UsersController < ApplicationController
:limit => @user_pages.items_per_page,
:offset => @user_pages.current.offset
- render :action => "list", :layout => false if request.xhr?
+ render :layout => !request.xhr?
end
def show
diff --git a/app/views/users/list.rhtml b/app/views/users/index.rhtml
similarity index 100%
rename from app/views/users/list.rhtml
rename to app/views/users/index.rhtml
diff --git a/config/routes.rb b/config/routes.rb
index 3f1024f5c..1e340011b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -157,7 +157,6 @@ ActionController::Routing::Routes.draw do |map|
map.with_options :controller => 'users' do |users|
users.with_options :conditions => {:method => :get} do |user_views|
- user_views.connect 'users', :action => 'list'
user_views.connect 'users', :action => 'index'
user_views.connect 'users/:id', :action => 'show', :id => /\d+/
user_views.connect 'users/new', :action => 'add'
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index af7ba1b51..74cfb656d 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -35,40 +35,39 @@ class UsersControllerTest < ActionController::TestCase
end
def test_index_routing
- #TODO: unify with list
assert_generates(
'/users',
:controller => 'users', :action => 'index'
)
+ assert_routing(
+ {:method => :get, :path => '/users'},
+ :controller => 'users', :action => 'index'
+ )
+ assert_recognizes(
+ {:controller => 'users', :action => 'index'},
+ {:method => :get, :path => '/users'}
+ )
end
def test_index
get :index
assert_response :success
- assert_template 'list'
- end
-
- def test_list_routing
- #TODO: rename action to index
- assert_routing(
- {:method => :get, :path => '/users'},
- :controller => 'users', :action => 'list'
- )
+ assert_template 'index'
end
- def test_list
- get :list
+ def test_index
+ get :index
assert_response :success
- assert_template 'list'
+ assert_template 'index'
assert_not_nil assigns(:users)
# active users only
assert_nil assigns(:users).detect {|u| !u.active?}
end
- def test_list_with_name_filter
- get :list, :name => 'john'
+ def test_index_with_name_filter
+ get :index, :name => 'john'
assert_response :success
- assert_template 'list'
+ assert_template 'index'
users = assigns(:users)
assert_not_nil users
assert_equal 1, users.size
--
GitLab