Moves the LDAP test server to a fixture.

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

Moves the LDAP test server to a fixture.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3490 e93f8b46-1217-0410-a6f0-8f06a7374b81
899f0661 · Jean-Philippe Lang · 7ae53845 · 899f0661 · 899f0661 · 899f0661
Commit 899f0661 authored Feb 26, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 24 deletions

auth_sources.yml test/fixtures/auth_sources.yml +13 -2

auth_source_ldap_test.rb test/unit/auth_source_ldap_test.rb +3 -11

user_test.rb test/unit/user_test.rb +2 -11

No files found.
--- a/test/fixtures/auth_sources.yml
+++ b/test/fixtures/auth_sources.yml
--- {}
-
+--- 
+auth_sources_001: 
+  id: 1
+  type: AuthSourceLdap
+  name: 'LDAP test server'
+  host: '127.0.0.1'
+  port: 389
+  base_dn: 'OU=Person,DC=redmine,DC=org'
+  attr_login: uid
+  attr_firstname: givenName
+  attr_lastname: sn
+  attr_mail: mail
+  onthefly_register: true
--- a/test/unit/auth_source_ldap_test.rb
+++ b/test/unit/auth_source_ldap_test.rb
@@ -18,7 +18,8 @@
 require File.dirname(__FILE__) + '/../test_helper'

 class AuthSourceLdapTest < ActiveSupport::TestCase
-
+  fixtures :auth_sources
+  
  def setup
  end
  
@@ -37,16 +38,7 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
  if ldap_configured?
    context '#authenticate' do
      setup do
-        @auth = AuthSourceLdap.generate!(:name => 'on the fly',
-                                         :host => '127.0.0.1',
-                                         :port => 389,
-                                         :base_dn => 'OU=Person,DC=redmine,DC=org',
-                                         :attr_login => 'uid',
-                                         :attr_firstname => 'givenName',
-                                         :attr_lastname => 'sn',
-                                         :attr_mail => 'mail',
-                                         :onthefly_register => true)
-
+        @auth = AuthSourceLdap.find(1)
      end

      context 'with a valid LDAP user' do

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'

 class UserTest < ActiveSupport::TestCase
-  fixtures :users, :members, :projects, :roles, :member_roles
+  fixtures :users, :members, :projects, :roles, :member_roles, :auth_sources

  def setup
    @admin = User.find(1)
@@ -124,16 +124,7 @@ class UserTest < ActiveSupport::TestCase
    context "#try_to_login using LDAP" do
      context "on the fly registration" do
        setup do
-          @auth_source = AuthSourceLdap.generate!(:name => 'localhost',
-                                                  :host => '127.0.0.1',
-                                                  :port => 389,
-                                                  :base_dn => 'OU=Person,DC=redmine,DC=org',
-                                                  :attr_login => 'uid',
-                                                  :attr_firstname => 'givenName',
-                                                  :attr_lastname => 'sn',
-                                                  :attr_mail => 'mail',
-                                                  :onthefly_register => true)
-
+          @auth_source = AuthSourceLdap.find(1)
        end

        context "with a successful authentication" do