From 515baded2cc6631f18f56d80d91b6ec66e37436b Mon Sep 17 00:00:00 2001 From: Benjamin Manns Date: Mon, 1 Nov 2010 11:01:27 -0400 Subject: [PATCH 1/2] add tests for i18n of Session#human_name and Session#model_name.human --- test/session_test/active_record_trickery_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/session_test/active_record_trickery_test.rb b/test/session_test/active_record_trickery_test.rb index bc766651..cb3d9852 100644 --- a/test/session_test/active_record_trickery_test.rb +++ b/test/session_test/active_record_trickery_test.rb @@ -19,6 +19,16 @@ def test_self_and_descendents_from_active_record def test_self_and_descendants_from_active_record assert_equal [UserSession], UserSession.self_and_descendants_from_active_record end + + def test_i18n_of_human_name + I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } } + assert_equal "MySession", UserSession.human_name + end + + def test_i18n_of_model_name_human + I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } } + assert_equal "MySession", UserSession.model_name.human + end end class InstanceMethodsTest < ActiveSupport::TestCase From 77532c4823f031abaf7af933f2c9541ad4258efa Mon Sep 17 00:00:00 2001 From: Benjamin Manns Date: Mon, 1 Nov 2010 11:02:02 -0400 Subject: [PATCH 2/2] add methods required for passing Session#model_name.human test --- lib/authlogic/session/active_record_trickery.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/authlogic/session/active_record_trickery.rb b/lib/authlogic/session/active_record_trickery.rb index 6a3597c8..33a937f2 100644 --- a/lib/authlogic/session/active_record_trickery.rb +++ b/lib/authlogic/session/active_record_trickery.rb @@ -46,6 +46,14 @@ def model_name ::ActiveSupport::ModelName.new(self.to_s) end end + + def i18n_scope + I18n.scope + end + + def lookup_ancestors + ancestors.select { |x| x.respond_to?(:model_name) } + end end module InstanceMethods