Merged LdapAuthSourceController into AuthSourceController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9232 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 63 insertions, 140 deletions

diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index e57e801b9..c7c297980 100644
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class AuthSourcesControllerTest < ActionController::TestCase
-  fixtures :users
+  fixtures :users, :auth_sources
 
   def setup
     @request.session[:user_id] = 1
@@ -37,54 +37,91 @@ class AuthSourcesControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_template 'new'
-    assert_kind_of AuthSource, assigns(:auth_source)
-    assert assigns(:auth_source).new_record?
+
+    source = assigns(:auth_source)
+    assert_equal AuthSourceLdap, source.class
+    assert source.new_record?
+
+    assert_tag 'input', :attributes => {:name => 'type', :value => 'AuthSourceLdap'}
+    assert_tag 'input', :attributes => {:name => 'auth_source[host]'}
   end
 
   def test_create
-    assert_difference 'AuthSource.count' do
-      post :create, :auth_source => {:name => 'Test'}
+    assert_difference 'AuthSourceLdap.count' do
+      post :create, :type => 'AuthSourceLdap', :auth_source => {:name => 'Test', :host => '127.0.0.1', :port => '389', :attr_login => 'cn'}
+      assert_redirected_to '/auth_sources'
     end
 
-    assert_redirected_to '/auth_sources'
-    auth_source = AuthSource.first(:order => 'id DESC')
-    assert_equal 'Test', auth_source.name
+    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, :type => 'AuthSourceLdap', :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
-    auth_source = AuthSource.create!(:name => 'TestEdit')
-    get :edit, :id => auth_source.id
+    get :edit, :id => 1
 
     assert_response :success
     assert_template 'edit'
-    assert_equal auth_source, assigns(:auth_source)
+
+    assert_tag 'input', :attributes => {:name => 'auth_source[host]'}
   end
 
   def test_update
-    auth_source = AuthSource.create!(:name => 'TestEdit')
-    post :update, :id => auth_source.id, :auth_source => {:name => 'TestUpdate'}
-
+    post :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '192.168.0.10', :port => '389', :attr_login => 'uid'}
     assert_redirected_to '/auth_sources'
-    assert_equal 'TestUpdate', auth_source.reload.name
+
+    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_without_users
-    auth_source = AuthSource.create!(:name => 'TestEdit')
-    assert_difference 'AuthSource.count', -1 do
-      post :destroy, :id => auth_source.id
+  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 '/auth_sources'
+    assert_not_nil flash[:notice]
+    assert_match /successful/i, flash[:notice]
   end
 
-  def test_destroy_with_users
-    auth_source = AuthSource.create!(:name => 'TestEdit')
-    User.find(2).update_attribute :auth_source, auth_source
-    assert_no_difference 'AuthSource.count' do
-      post :destroy, :id => auth_source.id
-    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 '/auth_sources'
-    assert AuthSource.find(auth_source.id)
+    assert_not_nil flash[:error]
+    assert_include '(Something went wrong)', flash[:error]
   end
 end
diff --git a/test/functional/ldap_auth_sources_controller_test.rb b/test/functional/ldap_auth_sources_controller_test.rb
deleted file mode 100644
index bfb2c569e..000000000
--- a/test/functional/ldap_auth_sources_controller_test.rb
+++ /dev/null
@@ -1,114 +0,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