get test running again for zentest > 4.0.0

also fix other bugs in the tests

test/functional/backend_controller_test.rb

@@ -4,7 +4,7 @@ require 'backend_controller'
 # Re-raise errors caught by the controller.
 class BackendController; def rescue_action(e) raise e end; end
 
-class BackendControllerTest < Test::Rails::TestCase
+class BackendControllerTest < ActionController::TestCase
   fixtures :users, :projects, :contexts, :todos, :recurring_todos, :notes
   
   def setup

test/functional/contexts_controller_test.rb

@@ -186,4 +186,4 @@ class ContextsControllerTest < TodoContainerControllerTestBase
   def protect_against_forgery?
     false
   end
-end
+end

test/functional/data_controller_test.rb

@@ -4,7 +4,7 @@ require 'data_controller'
 # Re-raise errors caught by the controller.
 class DataController; def rescue_action(e) raise e end; end
 
-class DataControllerTest < Test::Rails::TestCase
+class DataControllerTest < ActionController::TestCase
   fixtures :users, :preferences, :projects, :notes
 
   def setup

test/functional/feedlist_controller_test.rb

@@ -4,7 +4,7 @@ require 'feedlist_controller'
 # Re-raise errors caught by the controller.
 class FeedlistController; def rescue_action(e) raise e end; end
 
-class FeedlistControllerTest < Test::Rails::TestCase
+class FeedlistControllerTest < ActionController::TestCase
   fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :notes
   
   def setup

test/functional/integrations_controller_test.rb

@@ -4,7 +4,7 @@ require 'integrations_controller'
 # Re-raise errors caught by the controller.
 class IntegrationsController; def rescue_action(e) raise e end; end
 
-class IntegrationsControllerTest < Test::Unit::TestCase
+class IntegrationsControllerTest < ActionController::TestCase
   fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :tags, :taggings
 
   def setup

test/functional/login_controller_test.rb

@@ -5,7 +5,7 @@ require_dependency "login_system"
 # Re-raise errors caught by the controller.
 class LoginController; def rescue_action(e) raise e end; end
 
-class LoginControllerTest < Test::Rails::TestCase
+class LoginControllerTest < ActionController::TestCase
   fixtures :preferences, :users
   
   def setup

test/functional/notes_controller_test.rb

@@ -4,7 +4,7 @@ require 'notes_controller'
 # Re-raise errors caught by the controller.
 class NotesController; def rescue_action(e) raise e end; end
 
-class NotesControllerTest < Test::Rails::TestCase
+class NotesControllerTest < ActionController::TestCase
   def setup
     @controller = NotesController.new
     request    = ActionController::TestRequest.new

test/functional/preferences_controller_test.rb

@@ -5,7 +5,7 @@ require 'preference'
 # Re-raise errors caught by the controller.
 class PreferencesController; def rescue_action(e) raise e end; end
 
-class PreferencesControllerTest < Test::Rails::TestCase
+class PreferencesControllerTest < ActionController::TestCase
   fixtures :users, :preferences
   
   def setup

test/functional/stats_controller_test.rb

@@ -4,7 +4,7 @@ require 'stats_controller'
 # Re-raise errors caught by the controller.
 class StatsController; def rescue_action(e) raise e end; end
 
-class StatsControllerTest < Test::Unit::TestCase
+class StatsControllerTest < ActionController::TestCase
   fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos, :recurring_todos, :tags, :taggings
   
   def setup
@@ -59,7 +59,7 @@ class StatsControllerTest < Test::Unit::TestCase
     assert_equal 16, assigns['actions'].count
     assert_equal 4, assigns['tags_count']
     assert_equal 2, assigns['unique_tags_count']
-    assert_equal 2.week.ago.utc.beginning_of_day, assigns['first_action'].created_at
+    assert_equal 2.week.ago.beginning_of_day, assigns['first_action'].created_at
   end
   
   def test_downdrill

test/functional/todo_container_controller_test_base.rb

@@ -1,5 +1,10 @@
-class TodoContainerControllerTestBase < Test::Rails::TestCase
+class TodoContainerControllerTestBase < ActionController::TestCase
 
+  def setup_controller_request_and_response
+    # override with empty
+    # TODO: remove these ugly hacks
+  end
+  
   def perform_setup(container_class, controller_class)
     @controller = controller_class.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new

test/functional/todos_controller_test.rb

@@ -4,7 +4,7 @@ require 'todos_controller'
 # Re-raise errors caught by the controller.
 class TodosController; def rescue_action(e) raise e end; end
 
-class TodosControllerTest < Test::Rails::TestCase
+class TodosControllerTest < ActionController::TestCase
   fixtures :users, :preferences, :projects, :contexts, :todos, :tags, :taggings, :recurring_todos
 
   def setup
@@ -358,7 +358,7 @@ class TodosControllerTest < Test::Rails::TestCase
         "show_from(1i)"=>"", "show_from(2i)"=>"", "show_from(3i)"=>"",
         "project_id"=>"1",
         "notes"=>"test notes", "description"=>"test_mobile_create_action", "state"=>"0"}}
-    assert_redirected_to '/m'
+    assert_redirected_to '/mobile'
   end
 
   def test_mobile_create_action_renders_new_template_when_save_fails

test/functional/users_controller_test.rb

@@ -4,7 +4,7 @@ require 'users_controller'
 # Re-raise errors caught by the controller.
 class UsersController; def rescue_action(e) raise e end; end
 
-class UsersControllerTest < Test::Rails::TestCase
+class UsersControllerTest < ActionController::TestCase
   fixtures :preferences, :users
   
   def setup
@@ -51,10 +51,10 @@ class UsersControllerTest < Test::Rails::TestCase
   
   def test_destroy_user
     login_as :admin_user
-    @no_users_before = User.find(:all).size
-    xhr :post, :destroy, :id => users(:ldap_user).to_param
+    nr_users_before = User.find(:all).size
+    xhr :post, :destroy, :id => users(:ldap_user).id.to_param
     assert_rjs :page, "user-3", :remove
-    assert_equal @no_users_before-1, User.find(:all).size
+    assert_equal nr_users_before-1, User.find(:all).size
   end
   
   def test_update_password_successful