diff options
| -rw-r--r-- | railties/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | railties/lib/rails/commands/benchmarker.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/commands/profiler.rb | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 9ecb37e903..43aed3f0e7 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,11 @@ ## unreleased ## +* Fix bugs that crashed `rake test:benchmark`, `rails profiler` and + `rails benchmarker`. + Fixes #4938. + + *Yves Senn* + * Add support for runner hook. Backport #7695. diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb index b9169468a3..a2d92f8956 100644 --- a/railties/lib/rails/commands/benchmarker.rb +++ b/railties/lib/rails/commands/benchmarker.rb @@ -30,4 +30,5 @@ class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc: end RUBY end + ARGV.clear end diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb index 3f6966b4f0..9b3b4f41f6 100644 --- a/railties/lib/rails/commands/profiler.rb +++ b/railties/lib/rails/commands/profiler.rb @@ -29,4 +29,5 @@ class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc: end RUBY end + ARGV.clear end |