3 files changed, 8 insertions, 16 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 502e2811fa..a24915dfef 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -279,6 +279,7 @@ class DurationTest < ActiveSupport::TestCase
       ['PT1S',          1.second                         ],
       ['PT1.4S',        (1.4).seconds                    ],
       ['P1Y1M1DT1H',    1.year + 1.month + 1.day + 1.hour],
+      ['PT0S',          0.minutes                        ],
     ]
     expectations.each do |expected_output, duration|
       assert_equal expected_output, duration.iso8601, expected_output.inspect
diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb
deleted file mode 100644
index ac617a9fd8..0000000000
--- a/activesupport/test/load_paths_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'abstract_unit'
-
-class LoadPathsTest < ActiveSupport::TestCase
-  def test_uniq_load_paths
-    load_paths_count = $LOAD_PATH.inject({}) { |paths, path|
-      expanded_path = File.expand_path(path)
-      paths[expanded_path] ||= 0
-      paths[expanded_path] += 1
-      paths
-    }
-    load_paths_count[File.expand_path('../../lib', __FILE__)] -= 1
-
-    load_paths_count.select! { |k, v| v > 1 }
-    assert load_paths_count.empty?, load_paths_count.inspect
-  end
-end
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index a15d5c6a0e..76cbb5ce8b 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -388,6 +388,13 @@ class TimeZoneTest < ActiveSupport::TestCase
     end
   end
 
+  def test_strptime_with_malformed_string
+    with_env_tz 'US/Eastern' do
+      zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+      assert_raise(ArgumentError) { zone.strptime('1999-12-31', '%Y/%m/%d') }
+    end
+  end
+
   def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
     tzinfo = TZInfo::Timezone.get('America/New_York')
     zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo)