Merged Rails 2.0 compatibility changes.

Compatibility with Rails 1.2 is preserved.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@975 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 63 insertions, 1 deletions

diff --git a/test/fixtures/members.yml b/test/fixtures/members.yml
index 392225e52..2c9209131 100644
--- a/test/fixtures/members.yml
+++ b/test/fixtures/members.yml
@@ -17,4 +17,11 @@ members_003:
   role_id: 2

   id: 3

   user_id: 2

+members_004: 

+  id: 4

+  created_on: 2006-07-19 19:35:36 +02:00

+  project_id: 1

+  role_id: 2

+  # Locked user

+  user_id: 5

   
\ No newline at end of file
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index ffa2fe42e..df7123879 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -59,3 +59,19 @@ users_003:
   auth_source_id: 

   mail_notification: true

   login: dlopper

+users_005: 

+  id: 5

+  created_on: 2006-07-19 19:33:19 +02:00

+  # Locked

+  status: 3

+  last_login_on: 

+  language: en

+  hashed_password: 7feb7657aa7a7bf5aef3414a5084875f27192415

+  updated_on: 2006-07-19 19:33:19 +02:00

+  admin: false

+  mail: dlopper2@somenet.foo

+  lastname: Lopper2

+  firstname: Dave2

+  auth_source_id: 

+  mail_notification: true

+  login: dlopper2

diff --git a/test/functional/sys_api_test.rb b/test/functional/sys_api_test.rb
new file mode 100644
index 000000000..ec8d0964e
--- /dev/null
+++ b/test/functional/sys_api_test.rb
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sys_controller'
+
+# Re-raise errors caught by the controller.
+class SysController; def rescue_action(e) raise e end; end
+
+class SysControllerTest < Test::Unit::TestCase
+  fixtures :projects, :repositories
+  
+  def setup
+    @controller = SysController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    # Enable WS
+    Setting.sys_api_enabled = 1
+  end
+  
+  def test_projects
+    result = invoke :projects
+    assert_equal Project.count, result.size 
+    assert result.first.is_a?(Project)
+  end
+
+  def test_repository_created
+    project = Project.find(3)
+    assert_nil project.repository
+    assert invoke(:repository_created, project.identifier, 'http://localhost/svn')
+    project.reload
+    assert_not_nil project.repository
+  end
+end
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index a8cf46e4f..62ba2b02d 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'

 

 class ProjectTest < Test::Unit::TestCase

-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details

+  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles

 

   def setup

     @ecookbook = Project.find(1)

@@ -80,8 +80,16 @@ class ProjectTest < Test::Unit::TestCase
   end

   

   def test_destroy

+    # 2 active members

+    assert_equal 2, @ecookbook.members.size

+    # and 1 is locked

+    assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size

+    

     @ecookbook.destroy

+    # make sure that the project non longer exists

     assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }

+    # make sure all members have been removed

+    assert_equal 0, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size

   end

   

   def test_subproject_ok