get tests running again with zentest >= 4.0.0

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/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

@@ -1,146 +1,146 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'login_controller'
-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
-  fixtures :preferences, :users
-  
-  def setup
-    assert_equal "test", ENV['RAILS_ENV']
-    assert_equal "change-me", Tracks::Config.salt
-    @controller = LoginController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-  end
-
-  #============================================
-  #Login and logout
-  #============================================
-    
-  def test_invalid_login
-    post :login, {:user_login => 'cracker', :user_password => 'secret', :user_noexpiry => 'on'}
-    assert_response :success
-    assert(!@response.has_session_object?(:user_id))
-    assert_template "login"
-  end
-  
-  def test_login_with_valid_admin_user
-    @request.session['return-to'] = "/bogus/location"
-    post :login, {:user_login => 'admin', :user_password => 'abracadabra', :user_noexpiry => 'on'}
-    user = User.find(session['user_id'])
-    assert_equal user.id, @response.session['user_id']
-    assert_equal user.login, "admin"
-    assert user.is_admin
-    assert_equal "Login successful: session will not expire.", flash[:notice]
-    assert_equal("http://#{@request.host}/bogus/location", @response.redirect_url)
-  end
-  
-  def test_login_with_valid_standard_user
-    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
-    user = User.find(session['user_id'])
-    assert_equal user.id, @response.session['user_id']
-    assert_equal user.login, "jane"
-    assert user.is_admin == false || user.is_admin == 0
-    assert_equal "Login successful: session will expire after 1 hour of inactivity.", flash[:notice]
-    assert_redirected_to home_url
-  end
-  
-  def test_login_with_no_users_redirects_to_signup
-    User.delete_all
-    get :login
-    assert_redirected_to :controller => 'users', :action => 'new'
-  end
-  
-  def test_logout
-    login_as :admin_user
-    get :logout
-    assert_nil(session['user_id'])
-    assert_redirected_to :controller => 'login', :action => 'login'
-  end
-  
-  # Test login with a bad password for existing user
-  # 
-  def test_login_bad_password
-    post :login, {:user_login => 'jane', :user_password => 'wrong', :user_noexpiry => 'on'}
-    assert(!@response.has_session_object?(:user))
-    assert_equal "Login unsuccessful", flash[:warning]
-    assert_response :success
-  end
-  
-  def test_login_bad_login
-    post :login, {:user_login => 'blah', :user_password => 'sesame', :user_noexpiry => 'on'}
-    assert(!@response.has_session_object?(:user))
-    assert_equal "Login unsuccessful", flash[:warning]
-    assert_response :success
-  end
-  
-  def test_should_remember_me
-    post :login, :user_login => 'jane', :user_password => 'sesame', :user_noexpiry => "on"
-    assert_not_nil @response.cookies["auth_token"]
-  end
-
-  def test_should_not_remember_me
-    post :login, :user_login => 'jane', :user_password => 'sesame', :user_noexpiry => "off"
-    assert_nil @response.cookies["auth_token"]
-  end
-  
-  def test_should_delete_token_on_logout
-    login_as :other_user
-    get :logout
-    assert_equal @response.cookies["auth_token"], []
-  end
-
-  def test_should_login_with_cookie
-    users(:other_user).remember_me
-    @request.cookies["auth_token"] = auth_token_cookie_for(:other_user)
-    get :login
-    assert @controller.send(:logged_in?)
-  end
-
-  def test_should_fail_expired_cookie_login
-    users(:other_user).remember_me
-    users(:other_user).update_attribute :remember_token_expires_at, 5.minutes.ago.utc
-    @request.cookies["auth_token"] = auth_token_cookie_for(:other_user)
-    get :login
-    assert !@controller.send(:logged_in?)
-  end
-
-  def test_should_fail_cookie_login
-    users(:other_user).remember_me
-    @request.cookies["auth_token"] = CGI::Cookie.new('name' => 'auth_token', 'value' => 'invalid_auth_token')
-    get :login
-    assert !@controller.send(:logged_in?)
-  end
-  
-  def test_current_user_nil
-    get :login
-    assert_nil @controller.current_user
-  end
-  
-  def test_current_user_correct
-    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
-    assert_equal users(:other_user), @controller.current_user
-  end
-  
-  def test_prefs_nil
-    login_as nil
-    get :login
-    assert_nil @controller.prefs
-  end
-  
-  def test_prefs_correct
-    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
-    assert_equal users(:other_user).prefs, @controller.prefs
-  end
-  
-  private
-        
-  def auth_token_cookie_for(user)
-    CGI::Cookie.new('name' => 'auth_token', 'value' => users(user).remember_token)
-  end
-  
-    
-end
+require File.dirname(__FILE__) + '/../test_helper'
+require 'login_controller'
+require_dependency "login_system"
+
+# Re-raise errors caught by the controller.
+class LoginController; def rescue_action(e) raise e end; end
+
+class LoginControllerTest < ActionController::TestCase
+  fixtures :preferences, :users
+  
+  def setup
+    assert_equal "test", ENV['RAILS_ENV']
+    assert_equal "change-me", Tracks::Config.salt
+    @controller = LoginController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+  end
+
+  #============================================
+  #Login and logout
+  #============================================
+    
+  def test_invalid_login
+    post :login, {:user_login => 'cracker', :user_password => 'secret', :user_noexpiry => 'on'}
+    assert_response :success
+    assert(!@response.has_session_object?(:user_id))
+    assert_template "login"
+  end
+  
+  def test_login_with_valid_admin_user
+    @request.session['return-to'] = "/bogus/location"
+    post :login, {:user_login => 'admin', :user_password => 'abracadabra', :user_noexpiry => 'on'}
+    user = User.find(session['user_id'])
+    assert_equal user.id, @response.session['user_id']
+    assert_equal user.login, "admin"
+    assert user.is_admin
+    assert_equal "Login successful: session will not expire.", flash[:notice]
+    assert_equal("http://#{@request.host}/bogus/location", @response.redirect_url)
+  end
+  
+  def test_login_with_valid_standard_user
+    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
+    user = User.find(session['user_id'])
+    assert_equal user.id, @response.session['user_id']
+    assert_equal user.login, "jane"
+    assert user.is_admin == false || user.is_admin == 0
+    assert_equal "Login successful: session will expire after 1 hour of inactivity.", flash[:notice]
+    assert_redirected_to home_url
+  end
+  
+  def test_login_with_no_users_redirects_to_signup
+    User.delete_all
+    get :login
+    assert_redirected_to :controller => 'users', :action => 'new'
+  end
+  
+  def test_logout
+    login_as :admin_user
+    get :logout
+    assert_nil(session['user_id'])
+    assert_redirected_to :controller => 'login', :action => 'login'
+  end
+  
+  # Test login with a bad password for existing user
+  # 
+  def test_login_bad_password
+    post :login, {:user_login => 'jane', :user_password => 'wrong', :user_noexpiry => 'on'}
+    assert(!@response.has_session_object?(:user))
+    assert_equal "Login unsuccessful", flash[:warning]
+    assert_response :success
+  end
+  
+  def test_login_bad_login
+    post :login, {:user_login => 'blah', :user_password => 'sesame', :user_noexpiry => 'on'}
+    assert(!@response.has_session_object?(:user))
+    assert_equal "Login unsuccessful", flash[:warning]
+    assert_response :success
+  end
+  
+  def test_should_remember_me
+    post :login, :user_login => 'jane', :user_password => 'sesame', :user_noexpiry => "on"
+    assert_not_nil @response.cookies["auth_token"]
+  end
+
+  def test_should_not_remember_me
+    post :login, :user_login => 'jane', :user_password => 'sesame', :user_noexpiry => "off"
+    assert_nil @response.cookies["auth_token"]
+  end
+  
+  def test_should_delete_token_on_logout
+    login_as :other_user
+    get :logout
+    assert_equal @response.cookies["auth_token"], []
+  end
+
+  def test_should_login_with_cookie
+    users(:other_user).remember_me
+    @request.cookies["auth_token"] = auth_token_cookie_for(:other_user)
+    get :login
+    assert @controller.send(:logged_in?)
+  end
+
+  def test_should_fail_expired_cookie_login
+    users(:other_user).remember_me
+    users(:other_user).update_attribute :remember_token_expires_at, 5.minutes.ago.utc
+    @request.cookies["auth_token"] = auth_token_cookie_for(:other_user)
+    get :login
+    assert !@controller.send(:logged_in?)
+  end
+
+  def test_should_fail_cookie_login
+    users(:other_user).remember_me
+    @request.cookies["auth_token"] = CGI::Cookie.new('name' => 'auth_token', 'value' => 'invalid_auth_token')
+    get :login
+    assert !@controller.send(:logged_in?)
+  end
+  
+  def test_current_user_nil
+    get :login
+    assert_nil @controller.current_user
+  end
+  
+  def test_current_user_correct
+    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
+    assert_equal users(:other_user), @controller.current_user
+  end
+  
+  def test_prefs_nil
+    login_as nil
+    get :login
+    assert_nil @controller.prefs
+  end
+  
+  def test_prefs_correct
+    post :login, {:user_login => 'jane', :user_password => 'sesame', :user_noexpiry => 'off'}
+    assert_equal users(:other_user).prefs, @controller.prefs
+  end
+  
+  private
+        
+  def auth_token_cookie_for(user)
+    CGI::Cookie.new('name' => 'auth_token', 'value' => users(user).remember_token)
+  end
+  
+    
+end

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.at_midnight, assigns['first_action'].created_at.at_midnight
   end
   
   def test_downdrill

test/functional/todo_container_controller_test_base.rb

@@ -1,4 +1,9 @@
-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

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

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