diff options
| -rw-r--r-- | actionpack/test/dispatch/mime_type_test.rb | 12 | ||||
| -rw-r--r-- | activesupport/test/time_zone_test.rb | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb index a8bc2f0e64..b0b2aa0cc1 100644 --- a/actionpack/test/dispatch/mime_type_test.rb +++ b/actionpack/test/dispatch/mime_type_test.rb @@ -167,12 +167,12 @@ class MimeTypeTest < ActiveSupport::TestCase end test "regexp matcher" do - assert_match Mime[:js], "text/javascript" - assert_match Mime[:js], "application/javascript" - assert_no_match Mime[:js], "text/html" - assert_match Mime[:js], "text/javascript" - assert_match Mime[:js], "application/javascript" - assert_match Mime[:html], "application/xhtml+xml" + assert Mime[:js] =~ "text/javascript" + assert Mime[:js] =~ "application/javascript" + assert Mime[:js] !~ "text/html" + assert_not (Mime[:js] !~ "text/javascript") + assert_not (Mime[:js] !~ "application/javascript") + assert Mime[:html] =~ "application/xhtml+xml" end test "match?" do diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index eccacce32a..6ca3afd561 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -712,9 +712,9 @@ class TimeZoneTest < ActiveSupport::TestCase def test_zone_match zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] - assert_match zone, /Eastern/ - assert_match zone, /New_York/ - assert_no_match zone, /Nonexistent_Place/ + assert zone =~ /Eastern/ + assert zone =~ /New_York/ + assert zone !~ /Nonexistent_Place/ end def test_zone_match? |