diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-23 17:09:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 17:09:05 +0100 |
| commit | 4eead6633dff2066a988fa59039f7cac897294ab (patch) | |
| tree | e6a014c893c7932953ceb02fabb858de0c4eea52 /railties | |
| parent | f9a5fd52540c6228103af38218e909557b01b17a (diff) | |
| parent | 05781f1f9c0831d24ab2bf61421fe420967c60fa (diff) | |
| download | rails-4eead6633dff2066a988fa59039f7cac897294ab.tar.gz rails-4eead6633dff2066a988fa59039f7cac897294ab.tar.bz2 rails-4eead6633dff2066a988fa59039f7cac897294ab.zip | |
Merge pull request #34778 from yahonda/ruby25_frozen_error
No need to handle if FrozenError is available
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index a6396d3509..4242daf39a 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -255,7 +255,7 @@ module ApplicationTests test "can't change middleware after it's built" do boot! - assert_raise frozen_error_class do + assert_raise FrozenError do app.config.middleware.use Rack::Config end end diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 39c936428f..4523b66dda 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -462,10 +462,6 @@ class ActiveSupport::TestCase include TestHelpers::Generation include ActiveSupport::Testing::Stream include ActiveSupport::Testing::MethodCallAssertions - - def frozen_error_class - Object.const_defined?(:FrozenError) ? FrozenError : RuntimeError - end end # Create a scope and build a fixture rails app |