diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-25 15:20:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 15:20:48 -0400 |
| commit | 28bdb2ad1a0d2fd0810a491e9209cf2fbc5b0090 (patch) | |
| tree | ae7c505d3a7c72ef8af3ba9d6998adb4de81cfc5 /railties | |
| parent | 7a1c00d416dd69b1153395783cc457ae2c4830cf (diff) | |
| parent | 0d17168289a0ce7d6972b10fb3f979363b712338 (diff) | |
| download | rails-28bdb2ad1a0d2fd0810a491e9209cf2fbc5b0090.tar.gz rails-28bdb2ad1a0d2fd0810a491e9209cf2fbc5b0090.tar.bz2 rails-28bdb2ad1a0d2fd0810a491e9209cf2fbc5b0090.zip | |
Merge pull request #28853 from kamipo/replace_regexp_z
Replace \Z to \z
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 924503a522..2e742a005e 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -119,7 +119,7 @@ module TestHelpers end routes = File.read("#{app_path}/config/routes.rb") - if routes =~ /(\n\s*end\s*)\Z/ + if routes =~ /(\n\s*end\s*)\z/ File.open("#{app_path}/config/routes.rb", "w") do |f| f.puts $` + "\nActiveSupport::Deprecation.silence { match ':controller(/:action(/:id))(.:format)', via: :all }\n" + $1 end @@ -251,7 +251,7 @@ module TestHelpers def add_to_config(str) environment = File.read("#{app_path}/config/application.rb") - if environment =~ /(\n\s*end\s*end\s*)\Z/ + if environment =~ /(\n\s*end\s*end\s*)\z/ File.open("#{app_path}/config/application.rb", "w") do |f| f.puts $` + "\n#{str}\n" + $1 end @@ -260,7 +260,7 @@ module TestHelpers def add_to_env_config(env, str) environment = File.read("#{app_path}/config/environments/#{env}.rb") - if environment =~ /(\n\s*end\s*)\Z/ + if environment =~ /(\n\s*end\s*)\z/ File.open("#{app_path}/config/environments/#{env}.rb", "w") do |f| f.puts $` + "\n#{str}\n" + $1 end |