jro_apps/redmine Commit - r8933:9ffccf5304dc

Adds functional test for #test_connection....

Jean-Philippe Lang -

r8933:9ffccf5304dc

parent child

Context file:

r8933:9ffccf5304dc

Collapse all files

app/controllers/auth_sources_controller.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AuthSourcesController < ApplicationController
               layout 'admin'
               before_filter :require_admin
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :template => :index }
               def index
                 @auth_source_pages, @auth_sources = paginate auth_source_class.name.tableize, :per_page => 10
                 render "auth_sources/index"
               end
               def new
                 @auth_source = auth_source_class.new
                 render 'auth_sources/new'
               end
               def create
                 @auth_source = auth_source_class.new(params[:auth_source])
                 if @auth_source.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index'
                 else
                   render 'auth_sources/new'
                 end
               end
               def edit
                 @auth_source = AuthSource.find(params[:id])
                 render 'auth_sources/edit'
               end
               def update
                 @auth_source = AuthSource.find(params[:id])
                 if @auth_source.update_attributes(params[:auth_source])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index'
                 else
                   render 'auth_sources/edit'
                 end
               end
               def test_connection
                 @auth_method = AuthSource.find(params[:id])
                 begin
                   @auth_method.test_connection
                   flash[:notice] = l(:notice_successful_connection)
-                rescue => text
+                rescue Exception => e
-                  flash[:error] = l(:error_unable_to_connect, text.message)
+                  flash[:error] = l(:error_unable_to_connect, e.message)
                 end
                 redirect_to :action => 'index'
               end
               def destroy
                 @auth_source = AuthSource.find(params[:id])
                 unless @auth_source.users.find(:first)
                   @auth_source.destroy
                   flash[:notice] = l(:notice_successful_delete)
                 end
                 redirect_to :action => 'index'
               end
               protected
               def auth_source_class
                 AuthSource
               end
             end

test/functional/ldap_auth_sources_controller_test.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class LdapAuthSourcesControllerTest < ActionController::TestCase
               fixtures :auth_sources, :users
               def setup
                 @request.session[:user_id] = 1
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
                 source = assigns(:auth_source)
                 assert_equal AuthSourceLdap, source.class
                 assert source.new_record?
               end
               def test_create
                 assert_difference 'AuthSourceLdap.count' do
                   post :create, :auth_source => {:name => 'Test', :host => '127.0.0.1', :port => '389', :attr_login => 'cn'}
                   assert_redirected_to '/ldap_auth_sources'
                 end
                 source = AuthSourceLdap.first(:order => 'id DESC')
                 assert_equal 'Test', source.name
                 assert_equal '127.0.0.1', source.host
                 assert_equal 389, source.port
                 assert_equal 'cn', source.attr_login
               end
               def test_create_with_failure
                 assert_no_difference 'AuthSourceLdap.count' do
                   post :create, :auth_source => {:name => 'Test', :host => '', :port => '389', :attr_login => 'cn'}
                   assert_response :success
                   assert_template 'new'
                 end
                 assert_error_tag :content => /host can't be blank/i
               end
               def test_edit
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_update
                 post :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '192.168.0.10', :port => '389', :attr_login => 'uid'}
                 assert_redirected_to '/ldap_auth_sources'
                 source = AuthSourceLdap.find(1)
                 assert_equal 'Renamed', source.name
                 assert_equal '192.168.0.10', source.host
               end
               def test_update_with_failure
                 post :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'}
                 assert_response :success
                 assert_template 'edit'
                 assert_error_tag :content => /host can't be blank/i
               end
               def test_destroy
                 assert_difference 'AuthSourceLdap.count', -1 do
                   post :destroy, :id => 1
                 end
               end
               def test_destroy_auth_source_in_use
                 User.find(2).update_attribute :auth_source_id, 1
                 assert_no_difference 'AuthSourceLdap.count' do
                   post :destroy, :id => 1
                 end
               end
+              def test_test_connection
+                AuthSourceLdap.any_instance.stubs(:test_connection).returns(true)
+                get :test_connection, :id => 1
+                assert_redirected_to '/ldap_auth_sources'
+                assert_not_nil flash[:notice]
+                assert_match /successful/i, flash[:notice]
+              end
+              def test_test_connection_with_failure
+                AuthSourceLdap.any_instance.stubs(:test_connection).raises(Exception.new("Something went wrong"))
+                get :test_connection, :id => 1
+                assert_redirected_to '/ldap_auth_sources'
+                assert_not_nil flash[:error]
+                assert_include '(Something went wrong)', flash[:error]
+              end
             end

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