Fixed config typo when passing the :scope option to acts_as_authentic

EricDuminil · Nov 22, 2008 · 2b85651 · 2b85651
1 parent 4c310ed
commit 2b85651
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+== 1.3.1 released 2008-11-20
+
+* Fixed typo in acts_as_authentic config when passing the :scope option
+
 == 1.3.0 released 2008-11-20
 
 * BREAKS BACKWARDS COMPATIBILITY: changed the confirm_password field to password_confirmation for acts_as_authentic, since the rails validates_confirmation_of handles creating this attribute.

diff --git a/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb b/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb
@@ -181,7 +181,7 @@ def acts_as_authentic_with_config(options = {})
 
             if options[:scope]
               options[:login_field_validates_uniqueness_of_options][:scope] ||= options[:scope]
-              options[:email_field_validation_uniqueness_of_options][:scope] ||= options[:scope]
+              options[:email_field_validates_uniqueness_of_options][:scope] ||= options[:scope]
             end
 
             class_eval <<-"end_eval", __FILE__, __LINE__

diff --git a/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb b/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb
@@ -41,8 +41,6 @@ def acts_as_authentic_with_credentials(options = {})
 
               if options[:validate_password_field]
                 validates_presence_of options[:password_field], {:on => :create}.merge(options[:password_field_validates_presence_of_options])
-
-
                 validates_confirmation_of options[:password_field], options[:password_field_validates_confirmation_of_options].merge(:if => "#{options[:crypted_password_field]}_changed?".to_sym)
                 validates_presence_of "#{options[:password_field]}_confirmation", :if => "#{options[:crypted_password_field]}_changed?"
               end

diff --git a/test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/config_test.rb b/test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/config_test.rb
@@ -13,35 +13,35 @@ def test_first_column_to_exist
         def test_acts_as_authentic_config
           default_config = {
             :session_ids => [nil],
-           :email_field_validates_length_of_options => {},
-           :logged_in_timeout => 600,
-           :validate_password_field => true,
-           :login_field_validates_length_of_options => {},
-           :password_field_validation_options => {},
-           :login_field_type => :login,
-           :email_field_validates_format_of_options => {},
-           :crypted_password_field => :crypted_password,
-           :password_salt_field => :password_salt,
-           :login_field_validates_format_of_options => {},
-           :email_field_validation_options => {},
-           :crypto_provider => Authlogic::CryptoProviders::Sha512,
-           :persistence_token_field => :persistence_token,
-           :email_field_validates_uniqueness_of_options => {},
-           :session_class => "UserSession",
-           :single_access_token_field => :single_access_token,
-           :login_field_validates_uniqueness_of_options => {},
-           :validate_fields => true,
-           :login_field => :login,
-           :perishable_token_valid_for => 600,
-           :password_field_validates_presence_of_options => {},
-           :password_field => :password,
-           :validate_login_field => true,
-           :email_field => :email,
-           :perishable_token_field => :perishable_token,
-           :password_field_validates_confirmation_of_options => {},
-           :validate_email_field => true,
-           :validation_options => {},
-           :login_field_validation_options => {}
+            :email_field_validates_length_of_options => {},
+            :logged_in_timeout => 600,
+            :validate_password_field => true,
+            :login_field_validates_length_of_options => {},
+            :password_field_validation_options => {},
+            :login_field_type => :login,
+            :email_field_validates_format_of_options => {},
+            :crypted_password_field => :crypted_password,
+            :password_salt_field => :password_salt,
+            :login_field_validates_format_of_options => {},
+            :email_field_validation_options => {},
+            :crypto_provider => Authlogic::CryptoProviders::Sha512,
+            :persistence_token_field => :persistence_token,
+            :email_field_validates_uniqueness_of_options => {},
+            :session_class => "UserSession",
+            :single_access_token_field => :single_access_token,
+            :login_field_validates_uniqueness_of_options => {},
+            :validate_fields => true,
+            :login_field => :login,
+            :perishable_token_valid_for => 600,
+            :password_field_validates_presence_of_options => {},
+            :password_field => :password,
+            :validate_login_field => true,
+            :email_field => :email,
+            :perishable_token_field => :perishable_token,
+            :password_field_validates_confirmation_of_options => {},
+            :validate_email_field => true,
+            :validation_options => {},
+            :login_field_validation_options => {}
            }
           assert_equal default_config, User.acts_as_authentic_config
         end