Merge branch 'master' of github.com:lifo/docrails

3 files changed, 18 insertions, 12 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index d96f8e1de5..e62e7ef9aa 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -185,6 +185,13 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write('foo', bar)
     assert_nothing_raised { bar.gsub!(/.*/, 'baz') }
   end
+
+  def test_multi_get
+    @cache.write('foo', 1)
+    @cache.write('goo', 2)
+    result = @cache.read_multi('foo', 'goo')
+    assert_equal({'foo' => 1, 'goo' => 2}, result)
+  end
 end
 
 uses_memcached 'memcached backed store' do
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 234e41c772..58ca215970 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -230,18 +230,6 @@ class CoreExtStringMultibyteTest < ActiveSupport::TestCase
     assert !BYTE_STRING.is_utf8?
   end
 
-  if RUBY_VERSION < '1.8.7'
-    def test_core_ext_adds_chars
-      assert UNICODE_STRING.respond_to?(:chars)
-    end
-
-    def test_chars_warns_about_deprecation
-      assert_deprecated("String#chars") do
-        ''.chars
-      end
-    end
-  end
-
   if RUBY_VERSION < '1.9'
     def test_mb_chars_returns_self_when_kcode_not_set
       with_kcode('none') do
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 68027f7c94..3b7fbb7808 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -274,6 +274,17 @@ class TimeZoneTest < Test::Unit::TestCase
     assert_raise(ArgumentError) { ActiveSupport::TimeZone[false] }
   end
 
+  def test_unknown_zone_shouldnt_have_tzinfo_nor_utc_offset
+    zone = ActiveSupport::TimeZone.create("bogus")
+    assert_nil zone.tzinfo
+    assert_nil zone.utc_offset
+  end
+
+  def test_unknown_zone_with_utc_offset
+    zone = ActiveSupport::TimeZone.create("bogus", -21_600)
+    assert_equal(-21_600, zone.utc_offset)
+  end
+
   def test_new
     assert_equal ActiveSupport::TimeZone["Central Time (US & Canada)"], ActiveSupport::TimeZone.new("Central Time (US & Canada)")
   end