@@ -47,7 +47,7 @@ config.after_initialize do end config.gem "flexmock" -config.gem "ZenTest", :lib => "zentest" +config.gem "ZenTest", :lib => "zentest", :version => ">=4.0.0" config.gem "hpricot" config.gem "hoe" config/environments/test.rb @@ -22,7 +22,7 @@ end %> -1: +call_bill_gates_every_day: id: 1 user_id: 1 context_id: 1 @@ -48,7 +48,7 @@ end created_at: <%= last_week %> completed_at: ~ -2: +call_bill_gates_every_workday: id: 2 user_id: 1 context_id: 1 @@ -74,7 +74,7 @@ end created_at: <%= last_week %> completed_at: ~ -3: +call_bill_gates_every_week: id: 3 user_id: 1 context_id: 1 @@ -100,7 +100,7 @@ end created_at: <%= last_week %> completed_at: ~ -4: +check_with_bill_every_last_friday_of_month: id: 4 user_id: 1 context_id: 1 @@ -126,7 +126,7 @@ end created_at: <%= last_week %> completed_at: ~ -5: +birthday_reinier: id: 5 user_id: 1 context_id: 1 test/fixtures/recurring_todos.yml @@ -23,7 +23,7 @@ end %> -1: +call_bill: id: 1 context_id: 1 project_id: 2 @@ -35,7 +35,7 @@ end completed_at: ~ user_id: 1 -2: +call_dino_ext: id: 2 context_id: 2 project_id: 3 @@ -47,7 +47,7 @@ end completed_at: ~ user_id: 1 -3: +buy_milk: id: 3 context_id: 4 project_id: ~ @@ -59,7 +59,7 @@ end completed_at: <%= today %> user_id: 1 -4: +buy_bread: id: 4 context_id: 4 project_id: ~ @@ -71,7 +71,7 @@ end completed_at: <%= today %> user_id: 1 -5: +construct_dilation_device: id: 5 context_id: 5 project_id: 1 @@ -83,7 +83,7 @@ end completed_at: ~ user_id: 1 -6: +phone_grandfather: id: 6 context_id: 2 project_id: 1 @@ -107,7 +107,7 @@ book: completed_at: ~ user_id: 1 -8: +upgrade_rails: id: 8 context_id: 4 project_id: ~ @@ -119,7 +119,7 @@ book: completed_at: <%= today %> user_id: 1 -9: +due_today: id: 9 context_id: 1 project_id: ~ @@ -131,7 +131,7 @@ book: completed_at: ~ user_id: 1 -10: +foo: id: 10 context_id: 1 project_id: ~ @@ -143,7 +143,7 @@ book: completed_at: <%= last_week %> user_id: 1 -11: +buy_shares: id: 11 context_id: 1 project_id: 2 @@ -155,7 +155,7 @@ book: completed_at: ~ user_id: 1 -12: +buy_stego_bait: id: 12 context_id: 1 project_id: 3 @@ -167,7 +167,7 @@ book: completed_at: ~ user_id: 1 -13: +new_action_in_context: id: 13 context_id: 1 project_id: 3 @@ -179,7 +179,7 @@ book: completed_at: ~ user_id: 1 -14: +call_stock_broker: id: 14 context_id: 2 project_id: 2 @@ -191,7 +191,7 @@ book: completed_at: ~ user_id: 1 -15: +select_delorean_model: id: 15 context_id: 6 project_id: 1 @@ -204,7 +204,7 @@ book: show_from: <%= next_week %> user_id: 1 -16: +buy_tix: id: 16 context_id: 10 project_id: 4 @@ -218,7 +218,7 @@ book: user_id: 2 -17: +pal_confirmation: id: 17 context_id: 11 project_id: 4 @@ -231,7 +231,7 @@ book: show_from: <%= next_week %> user_id: 2 -18: +call_bill_gates_every_day: id: 18 user_id: 1 context_id: 1 test/fixtures/todos.yml @@ -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/backend_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/data_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/feedlist_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/integrations_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/login_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/notes_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/preferences_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/stats_controller_test.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/todo_container_controller_test_base.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/todos_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 test/functional/users_controller_test.rb @@ -1,7 +1,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require File.expand_path(File.dirname(__FILE__) + "/../app/controllers/application") -require 'test/rails' #you need the zentest gem installed +require 'autotest/rails' #you need the zentest gem installed require 'test_help' require 'flexmock/test_unit' #and the flexmock gem, too! require 'action_web_service/test_invoke' @@ -41,21 +41,8 @@ class Test::Unit::TestCase end -class Test::Rails::HelperTestCase - - self.use_transactional_fixtures = false - self.use_instantiated_fixtures = false - -end - -class Test::Rails::TestCase < Test::Unit::TestCase - - # Turn off transactional fixtures if you're working with MyISAM tables in MySQL - self.use_transactional_fixtures = true - - # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david) - self.use_instantiated_fixtures = false - +class ActiveSupport::TestCase + # Generates a random string of ascii characters (a-z, "1 0") # of a given length for testing assignment to fields # for validation purposes test/test_helper.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ContextTest < Test::Rails::TestCase +class ContextTest < ActiveSupport::TestCase fixtures :contexts, :todos, :recurring_todos, :users, :preferences def setup test/unit/context_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class MessageGatewayTest < Test::Rails::TestCase +class MessageGatewayTest < ActiveSupport::TestCase fixtures :users, :contexts def setup test/unit/message_gateway_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class NotesTest < Test::Rails::TestCase +class NotesTest < ActiveSupport::TestCase fixtures :notes def setup test/unit/notes_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class PreferenceTest < Test::Rails::TestCase +class PreferenceTest < ActiveSupport::TestCase fixtures :users, :preferences def setup test/unit/preference_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class ProjectTest < Test::Rails::TestCase +class ProjectTest < ActiveSupport::TestCase fixtures :projects, :contexts, :todos, :recurring_todos, :users, :preferences def setup test/unit/project_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class RecurringTodoTest < Test::Rails::TestCase +class RecurringTodoTest < ActiveSupport::TestCase fixtures :todos, :users, :contexts, :preferences, :tags, :taggings, :recurring_todos def setup test/unit/recurring_todo_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TagTest < Test::Rails::TestCase +class TagTest < ActiveSupport::TestCase fixtures :tags # Replace this with your real tests. test/unit/tag_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class TaggingTest < Test::Rails::TestCase +class TaggingTest < ActiveSupport::TestCase fixtures :taggings # Replace this with your real tests. test/unit/tagging_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' require 'todos_controller' -class TodoCreateParamsHelperTest < Test::Rails::TestCase +class TodoCreateParamsHelperTest < ActiveSupport::TestCase def test_works_with_request_as_root_hash_entry params = {'request' => { 'todo' => { 'description' => 'foo'}}} test/unit/todo_create_params_helper_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' require 'date' -class TodoTest < Test::Rails::TestCase +class TodoTest < ActiveSupport::TestCase fixtures :todos, :recurring_todos, :users, :contexts, :preferences, :tags, :taggings def setup test/unit/todo_test.rb @@ -16,7 +16,7 @@ class SimpleLdapAuthenticator end end -class UserTest < Test::Rails::TestCase +class UserTest < ActiveSupport::TestCase fixtures :users, :preferences, :projects, :contexts, :todos, :recurring_todos def setup test/unit/user_test.rb 4e1e18da0fca66ffe8ca56026a36879dc2327459 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/7a7862221d7ca6eb6009d362cdf7cdc4f5ec84b3 7a7862221d7ca6eb6009d362cdf7cdc4f5ec84b3 2009-06-02T12:22:50-07:00 2009-06-02T12:22:50-07:00 get tests running again with zentest >= 4.0.0 53d1ce78ace56a1ef01dcc70ec6e0d20e7a2937b Reinier Balt lrbalt@gmail.com