authlogic 3.4.6 → 4.2.0

data/test/authenticates_many_test.rb

@@ -1,16 +1,31 @@
-require 'test_helper'
+require "test_helper"
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
-  def test_scoping
-    zack = users(:zack)
-    ben = users(:ben)
+  def test_employee_sessions
     binary_logic = companies(:binary_logic)
-    set_session_for(zack)
-    
-    assert !binary_logic.user_sessions.find
-    
-    set_session_for(ben)
-    
+
+    # Drew is a binary_logic employee, authentication succeeds
+    drew = employees(:drew)
+    set_session_for(drew)
+    assert binary_logic.employee_sessions.find
+
+    # Jennifer is not a binary_logic employee, authentication fails
+    jennifer = employees(:jennifer)
+    set_session_for(jennifer)
+    refute binary_logic.employee_sessions.find
+  end
+
+  def test_user_sessions
+    binary_logic = companies(:binary_logic)
+
+    # Ben is a binary_logic user, authentication succeeds
+    ben = users(:ben)
+    set_session_for(ben, binary_logic)
     assert binary_logic.user_sessions.find
+
+    # Zack is not a binary_logic user, authentication fails
+    zack = users(:zack)
+    set_session_for(zack, binary_logic)
+    refute binary_logic.user_sessions.find
   end
-end
+end

data/test/config_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class ConfigTest < ActiveSupport::TestCase
   def setup
@@ -6,7 +6,7 @@ class ConfigTest < ActiveSupport::TestCase
       extend Authlogic::Config
 
       def self.foobar(value = nil)
-        rw_config(:foobar_field, value, 'default_foobar')
+        rw_config(:foobar_field, value, "default_foobar")
       end
     }
 
@@ -18,19 +18,19 @@ class ConfigTest < ActiveSupport::TestCase
   end
 
   def test_rw_config_read_with_default
-    assert 'default_foobar', @klass.foobar
+    assert "default_foobar", @klass.foobar
   end
 
   def test_rw_config_write
-    assert_equal 'my_foobar', @klass.foobar('my_foobar')
-    assert_equal 'my_foobar', @klass.foobar
+    assert_equal "my_foobar", @klass.foobar("my_foobar")
+    assert_equal "my_foobar", @klass.foobar
 
-    assert_equal 'my_new_foobar', @klass.foobar('my_new_foobar')
-    assert_equal 'my_new_foobar', @klass.foobar
+    assert_equal "my_new_foobar", @klass.foobar("my_new_foobar")
+    assert_equal "my_new_foobar", @klass.foobar
   end
 
   def test_subclass_rw_config_write
-    assert_equal 'subklass_foobar', @subklass.foobar('subklass_foobar')
-    assert_equal 'default_foobar', @klass.foobar
+    assert_equal "subklass_foobar", @subklass.foobar("subklass_foobar")
+    assert_equal "default_foobar", @klass.foobar
   end
 end

data/test/crypto_provider_test/aes256_test.rb

@@ -1,14 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class AES256Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::AES256.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::AES256.encrypt("mypass")
       assert Authlogic::CryptoProviders::AES256.matches?(hash, "mypass")
     end
   end
-end
+end

data/test/crypto_provider_test/bcrypt_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class BCryptTest < ActiveSupport::TestCase

data/test/crypto_provider_test/scrypt_test.rb

@@ -1,11 +1,11 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class SCryptTest < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::SCrypt.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::SCrypt.encrypt("mypass")
       assert Authlogic::CryptoProviders::SCrypt.matches?(hash, "mypass")

data/test/crypto_provider_test/sha1_test.rb

@@ -1,16 +1,16 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class Sha1Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha1.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha1.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha1.matches?(hash, "mypass")
     end
-    
+
     def test_old_restful_authentication_passwords
       password = "test"
       salt = "7e3041ebc2fc05a40c60028e2c4901a81035d3cd"
@@ -20,4 +20,4 @@ module CryptoProviderTest
       Authlogic::CryptoProviders::Sha1.stretches = 10
     end
   end
-end
+end

data/test/crypto_provider_test/sha256_test.rb

@@ -1,11 +1,11 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class Sha256Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha256.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha256.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha256.matches?(hash, "mypass")

data/test/crypto_provider_test/sha512_test.rb

@@ -1,14 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
 module CryptoProviderTest
   class Sha512Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha512.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha512.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha512.matches?(hash, "mypass")
     end
   end
-end
+end

data/test/crypto_provider_test/wordpress_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+::ActiveSupport::Deprecation.silence do
+  require "authlogic/crypto_providers/wordpress"
+end
+
+module CryptoProviderTest
+  class WordpressTest < ActiveSupport::TestCase
+    def test_matches
+      plain = "banana"
+      salt = "aaa"
+      crypted = "xxx0nope"
+      # I couldn't figure out how to even execute this method without it
+      # crashing. Maybe, when Jeffry wrote it in 2009, `Digest::MD5.digest`
+      # worked differently. He was probably using ruby 1.9 back then.
+      # Given that I can't even figure out how to run it, and for all the other
+      # reasons I've given in `wordpress.rb`, I'm just going to deprecate
+      # the whole file. -Jared 2018-04-09
+      assert_raises(NoMethodError) {
+        Authlogic::CryptoProviders::Wordpress.matches?(crypted, plain, salt)
+      }
+    end
+  end
+end

data/test/gemfiles/Gemfile.rails-4.2.x

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
-gem "activerecord", "~> 4.2.0"
-gem "activesupport", "~> 4.2.0"
+gem "activerecord", "~> 4.2.8.rc1"
+gem "activesupport", "~> 4.2.8.rc1"
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 gem 'sqlite3', :platforms => :ruby

data/test/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", "~> 5.0.1"
+gem "activesupport", "~> 5.0.1"
+gem 'sqlite3', :platforms => :ruby

data/test/gemfiles/Gemfile.rails-5.1.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", "~> 5.1.0"
+gem "activesupport", "~> 5.1.0"
+gem 'sqlite3', :platforms => :ruby

data/test/gemfiles/Gemfile.rails-5.2.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", "~> 5.2.x"
+gem "activesupport", "~> 5.2.x"
+gem 'sqlite3', :platforms => :ruby

data/test/gemfiles/Gemfile.rails-master

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", github: "rails/rails"
+gem "activesupport", github: "rails/rails"
+gem "sqlite3", :platforms => :ruby

data/test/i18n_test.rb

@@ -1,33 +1,33 @@
-require 'test_helper'
+require "test_helper"
 
 class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default
     assert_equal :authlogic, Authlogic::I18n.scope
   end
-  
+
   def test_can_set_scope
-    assert_nothing_raised { Authlogic::I18n.scope = [:a, :b] }
-    assert_equal [:a, :b], Authlogic::I18n.scope
+    assert_nothing_raised { Authlogic::I18n.scope = %i[a b] }
+    assert_equal %i[a b], Authlogic::I18n.scope
     Authlogic::I18n.scope = :authlogic
   end
-  
+
   def test_uses_built_in_translator_by_default
     assert_equal Authlogic::I18n::Translator, Authlogic::I18n.translator.class
   end
-  
+
   def test_can_set_custom_translator
     old_translator = Authlogic::I18n.translator
-    
+
     assert_nothing_raised do
       Authlogic::I18n.translator = Class.new do
-        def translate(key, options = {})
+        def translate(key, _options = {})
           "Translated: #{key}"
         end
       end.new
     end
 
     assert_equal "Translated: x", Authlogic::I18n.translate(:x)
-    
+
     Authlogic::I18n.translator = old_translator
   end
 end

data/test/libs/affiliate.rb

@@ -2,6 +2,6 @@ class Affiliate < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypted_password_field = :pw_hash
   end
-  
+
   belongs_to :company
-end
+end

data/test/libs/company.rb

@@ -1,6 +1,6 @@
 class Company < ActiveRecord::Base
   authenticates_many :employee_sessions
-  authenticates_many :user_sessions
-  has_many :employees, :dependent => :destroy
-  has_many :users, :dependent => :destroy
-end
+  authenticates_many :user_sessions, scope_cookies: true
+  has_many :employees, dependent: :destroy
+  has_many :users, dependent: :destroy
+end

data/test/libs/employee.rb

@@ -2,6 +2,6 @@ class Employee < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider Authlogic::CryptoProviders::AES256
   end
-  
+
   belongs_to :company
-end
+end

data/test/libs/employee_session.rb

@@ -1,2 +1,2 @@
 class EmployeeSession < Authlogic::Session::Base
-end
+end

data/test/libs/ldaper.rb

@@ -1,3 +1,3 @@
 class Ldaper < ActiveRecord::Base
   acts_as_authentic
-end
+end

data/test/libs/project.rb

@@ -1,3 +1,3 @@
 class Project < ActiveRecord::Base
   has_and_belongs_to_many :users
-end
+end

data/test/libs/user_session.rb

@@ -15,11 +15,11 @@ class WackyUserSession < Authlogic::Session::Base
 
   def persist_by_false
     self.counter += 1
-    return false
+    false
   end
 
   def persist_by_true
     self.counter += 1
-    return true
+    true
   end
 end

data/test/random_test.rb

@@ -1,42 +1,13 @@
-require 'test_helper'
+require "test_helper"
 
 class RandomTest < ActiveSupport::TestCase
-  def test_random_tokens_are_indeed_random
-    # this might fail if you are *really* unlucky :)
-    with_any_random do
-      assert_not_equal Authlogic::Random.hex_token,       Authlogic::Random.hex_token
-      assert_not_equal Authlogic::Random.friendly_token,  Authlogic::Random.friendly_token
-    end
+  def test_that_hex_tokens_are_unique
+    tokens = Array.new(100) { Authlogic::Random.hex_token }
+    assert_equal tokens.size, tokens.uniq.size
   end
 
-  private
-    def with_any_random(&block)
-      [true, false].each {|val| with_secure_random_enabled(val, &block)}
-    end
-
-    def with_secure_random_enabled(enabled = true)
-      # can't really test SecureRandom if we don't have an implementation
-      return if enabled && !Authlogic::Random::SecureRandom
-    
-      current_sec_rand = Authlogic::Random::SecureRandom
-      reload_authlogic_with_sec_random!(current_sec_rand, enabled)
-  
-      yield
-    ensure
-      reload_authlogic_with_sec_random!(current_sec_rand)
-    end
-
-    def reload_authlogic_with_sec_random!(secure_random, enabled = true)
-      silence_warnings do
-        secure_random.parent.const_set(secure_random.name.sub("#{secure_random.parent}::", ''), enabled ? secure_random : nil)
-        load(File.dirname(__FILE__) + '/../lib/authlogic/random.rb')
-      end
-    end
-
-    def silence_warnings
-      old_verbose, $VERBOSE = $VERBOSE, nil
-      yield
-    ensure
-      $VERBOSE = old_verbose
-    end
-end
+  def test_that_friendly_tokens_are_unique
+    tokens = Array.new(100) { Authlogic::Random.friendly_token }
+    assert_equal tokens.size, tokens.uniq.size
+  end
+end

data/test/session_test/activation_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module ActivationTest
@@ -6,9 +6,9 @@ module SessionTest
       def test_activated
         assert UserSession.activated?
         Authlogic::Session::Base.controller = nil
-        assert !UserSession.activated?
+        refute UserSession.activated?
       end
-    
+
       def test_controller
         Authlogic::Session::Base.controller = nil
         assert_nil Authlogic::Session::Base.controller
@@ -20,18 +20,18 @@ module SessionTest
         thread1.join
 
         assert_nil Authlogic::Session::Base.controller
-      
+
         thread2 = Thread.new do
           controller = MockController.new
           Authlogic::Session::Base.controller = controller
           assert_equal controller, Authlogic::Session::Base.controller
         end
         thread2.join
-      
+
         assert_nil Authlogic::Session::Base.controller
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_init
         UserSession.controller = nil
@@ -40,4 +40,4 @@ module SessionTest
       end
     end
   end
-end
+end