cleanup test suite for 1.9.2

binarylogic · binarylogic · commit a78e063dcc9b · 2010-09-05T11:50:44.000-04:00
diff --git a/test/acts_as_authentic_test/base_test.rb b/test/acts_as_authentic_test/base_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class BaseTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/email_test.rb b/test/acts_as_authentic_test/email_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/logged_in_status_test.rb b/test/acts_as_authentic_test/logged_in_status_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoggedInStatusTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/login_test.rb b/test/acts_as_authentic_test/login_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoginTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/magic_columns_test.rb b/test/acts_as_authentic_test/magic_columns_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class MagicColumnsTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/password_test.rb b/test/acts_as_authentic_test/password_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PasswordTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/perishable_token_test.rb b/test/acts_as_authentic_test/perishable_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PerishableTokenTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/persistence_token_test.rb b/test/acts_as_authentic_test/persistence_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PersistenceTokenTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/restful_authentication_test.rb b/test/acts_as_authentic_test/restful_authentication_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class RestfulAuthenticationTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/session_maintenance_test.rb b/test/acts_as_authentic_test/session_maintenance_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SessionMaintenanceTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/single_access_test.rb b/test/acts_as_authentic_test/single_access_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SingleAccessTest < ActiveSupport::TestCase
diff --git a/test/authenticates_many_test.rb b/test/authenticates_many_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
   def test_scoping
diff --git a/test/crypto_provider_test/aes256_test.rb b/test/crypto_provider_test/aes256_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class AES256Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/bcrypt_test.rb b/test/crypto_provider_test/bcrypt_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class BCrpytTest < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha1_test.rb b/test/crypto_provider_test/sha1_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha1Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha256_test.rb b/test/crypto_provider_test/sha256_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha256Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha512_test.rb b/test/crypto_provider_test/sha512_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha512Test < ActiveSupport::TestCase
diff --git a/test/i18n_test.rb b/test/i18n_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default
diff --git a/test/random_test.rb b/test/random_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class RandomTest < ActiveSupport::TestCase
   def test_random_tokens_are_indeed_random
diff --git a/test/session_test/activation_test.rb b/test/session_test/activation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActivationTest
diff --git a/test/session_test/active_record_trickery_test.rb b/test/session_test/active_record_trickery_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActiveRecordTrickeryTest
@@ -29,7 +29,7 @@ def test_new_record
       
       def test_to_model
         session = UserSession.new
-        assert session, session.to_model
+        assert_equal session, session.to_model
       end
     end
   end
diff --git a/test/session_test/brute_force_protection_test.rb b/test/session_test/brute_force_protection_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module BruteForceProtectionTest
diff --git a/test/session_test/callbacks_test.rb b/test/session_test/callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase
diff --git a/test/session_test/cookies_test.rb b/test/session_test/cookies_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module CookiesTest
diff --git a/test/session_test/existence_test.rb b/test/session_test/existence_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ExistenceTest
diff --git a/test/session_test/http_auth_test.rb b/test/session_test/http_auth_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class HttpAuthTest < ActiveSupport::TestCase
diff --git a/test/session_test/id_test.rb b/test/session_test/id_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class IdTest < ActiveSupport::TestCase
diff --git a/test/session_test/klass_test.rb b/test/session_test/klass_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module KlassTest
diff --git a/test/session_test/magic_columns_test.rb b/test/session_test/magic_columns_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module MagicColumnsTest
diff --git a/test/session_test/magic_states_test.rb b/test/session_test/magic_states_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest
diff --git a/test/session_test/params_test.rb b/test/session_test/params_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ParamsTest
diff --git a/test/session_test/password_test.rb b/test/session_test/password_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module PasswordTest
diff --git a/test/session_test/perishability_test.rb b/test/session_test/perishability_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PerishabilityTest < ActiveSupport::TestCase
diff --git a/test/session_test/persistence_test.rb b/test/session_test/persistence_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PersistenceTest < ActiveSupport::TestCase
diff --git a/test/session_test/scopes_test.rb b/test/session_test/scopes_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ScopesTest < ActiveSupport::TestCase
diff --git a/test/session_test/session_test.rb b/test/session_test/session_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest
diff --git a/test/session_test/timeout_test.rb b/test/session_test/timeout_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module TimeoutTest
diff --git a/test/session_test/unauthorized_record_test.rb b/test/session_test/unauthorized_record_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class UnauthorizedRecordTest < ActiveSupport::TestCase
diff --git a/test/session_test/validation_test.rb b/test/session_test/validation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ValidationTest < ActiveSupport::TestCase

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require File.dirname(__FILE__) + '/../test_helper.rb'`
	`1`	`+require 'test_helper'`
`2`	`2`
`3`	`3`	`module ActsAsAuthenticTest`
`4`	`4`	`class BaseTest < ActiveSupport::TestCase`