[PATCH conductor 2/3] Fix self-service user creation test

Scott Seago sseago at redhat.com
Tue Jul 10 18:18:11 UTC 2012


Fix the two tests that now fail after making internal server errors
return 500 as expected. Change the expectation for /users/new to
expect a login redirect rather than a self-service user creation form.
Change the users_controller to require a valid user for the new/create
actions.
---
 src/app/controllers/users_controller.rb            |    6 +++---
 .../controllers/user_sessions_controller_spec.rb   |    1 +
 src/spec/controllers/users_controller_spec.rb      |    5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index d726370..0bc4658 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -15,7 +15,7 @@
 #
 
 class UsersController < ApplicationController
-  before_filter :require_user, :except => [:new, :create]
+  before_filter :require_user
   before_filter :load_users, :only => [:show]
 
   def index
@@ -36,7 +36,7 @@ class UsersController < ApplicationController
   end
 
   def new
-    require_privilege(Privilege::CREATE, User) unless current_user.nil?
+    require_privilege(Privilege::CREATE, User)
     @title = t'users.new.new_user'
     @user = User.new
     @user.quota = Quota.new
@@ -47,7 +47,7 @@ class UsersController < ApplicationController
       redirect_to :action => 'new' and return
     end
 
-    require_privilege(Privilege::MODIFY, User) unless current_user.nil?
+    require_privilege(Privilege::MODIFY, User)
     @user = User.new(params[:user])
     @user.quota ||= Quota.new
 
diff --git a/src/spec/controllers/user_sessions_controller_spec.rb b/src/spec/controllers/user_sessions_controller_spec.rb
index 9916b46..893b0f1 100644
--- a/src/spec/controllers/user_sessions_controller_spec.rb
+++ b/src/spec/controllers/user_sessions_controller_spec.rb
@@ -28,6 +28,7 @@ describe UserSessionsController do
   end
 
   it "should call new method" do
+    mock_warden(nil)
     {:get => 'login'}.should route_to(:controller => 'user_sessions', :action => 'new')
     get :new
     response.should be_success
diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb
index a4c4bea..3f57959 100644
--- a/src/spec/controllers/users_controller_spec.rb
+++ b/src/spec/controllers/users_controller_spec.rb
@@ -25,9 +25,10 @@ describe UsersController do
     @admin = @admin_permission.user
   end
 
-  it "allows user to get to registration form for new user" do
+  it "redirects to login form for new user as self-service user creation is not currently supported" do
+    mock_warden(nil)
     get :new
-    response.should be_success
+    response.should be_redirect
   end
 
   describe "#create" do
-- 
1.7.6.5




More information about the aeolus-devel mailing list