diff options
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/generators_test.rb | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index f70c9ebab9..8d66cd2fd3 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -61,6 +61,7 @@ module Rails } def self.configure!(config) #:nodoc: + http_only! if config.http_only? no_color! unless config.colorize_logging aliases.deep_merge! config.aliases options.deep_merge! config.options @@ -68,7 +69,6 @@ module Rails templates_path.concat config.templates templates_path.uniq! hide_namespaces(*config.hidden_namespaces) - http_only! if config.http_only? end def self.templates_path diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb index bf58bb3f74..7ebb68152f 100644 --- a/railties/test/application/generators_test.rb +++ b/railties/test/application/generators_test.rb @@ -125,5 +125,20 @@ module ApplicationTests assert_equal expected, c.generators.options end end + + test "http only allow overriding generators on initialization" do + add_to_config <<-RUBY + config.generators.helper = true + config.generators.http_only! + config.generators.template_engine = :my_template + RUBY + + # Initialize the application + require "#{app_path}/config/environment" + Rails.application.load_generators + + assert_equal :my_template, Rails::Generators.options[:rails][:template_engine] + assert_equal true, Rails::Generators.options[:rails][:helper] + end end end |