aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-04-24 13:40:58 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-04-25 08:33:47 +0900
commit996092ec18ac3ad9e0c573da73325fdc34aefac0 (patch)
treeee8fc2c46caae0436880a9ce1e38b020ad280938 /railties
parent9fa07095a35be2d8cb5adcc992b988e73a6d9719 (diff)
downloadrails-996092ec18ac3ad9e0c573da73325fdc34aefac0.tar.gz
rails-996092ec18ac3ad9e0c573da73325fdc34aefac0.tar.bz2
rails-996092ec18ac3ad9e0c573da73325fdc34aefac0.zip
register rake options to `OptionParser`
In order to prevent `OptionParser::ParseError` when specify the rake options to `routes` task.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/tasks/routes.rake3
-rw-r--r--railties/test/application/rake_test.rb11
2 files changed, 14 insertions, 0 deletions
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 69103aa5d9..ff7233cae9 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -19,6 +19,9 @@ task routes: :environment do
OptionParser.new do |opts|
opts.banner = "Usage: rails routes [options]"
+
+ Rake.application.standard_rake_options.each { |args| opts.on(*args) }
+
opts.on("-c CONTROLLER") do |controller|
routes_filter = { controller: controller }
end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 1a786a3fd3..1fa5b5e2b5 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -228,6 +228,17 @@ module ApplicationTests
MESSAGE
end
+ def test_rake_routes_with_rake_options
+ app_file "config/routes.rb", <<-RUBY
+ Rails.application.routes.draw do
+ get '/cart', to: 'cart#show'
+ end
+ RUBY
+
+ output = Dir.chdir(app_path){ `bin/rake --rakefile Rakefile routes` }
+ assert_equal "Prefix Verb URI Pattern Controller#Action\n cart GET /cart(.:format) cart#show\n", output
+ end
+
def test_logger_is_flushed_when_exiting_production_rake_tasks
add_to_config <<-RUBY
rake_tasks do