Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_view/helpers/javascript_helper.rb
	activesupport/lib/active_support/dependencies.rb
	activesupport/lib/active_support/inflector.rb
	activesupport/lib/active_support/values/time_zone.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index e5ecb0e254..7f4a8817ca 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -942,13 +942,13 @@ end # uses_mocha
 class InheritableTemplateRootTest < Test::Unit::TestCase
   def test_attr
     expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
-    assert_equal expected, FunkyPathMailer.template_root
+    assert_equal [expected], FunkyPathMailer.template_root.map(&:to_s)
 
     sub = Class.new(FunkyPathMailer)
     sub.template_root = 'test/path'
 
-    assert_equal 'test/path', sub.template_root
-    assert_equal expected, FunkyPathMailer.template_root
+    assert_equal ['test/path'], sub.template_root.map(&:to_s)
+    assert_equal [expected], FunkyPathMailer.template_root.map(&:to_s)
   end
 end