diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-01-28 10:03:47 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-01-28 10:03:47 -0800 |
| commit | 6268fcdc3083496d3336cfcecac2868e17f8d3b6 (patch) | |
| tree | 25be003009dc4d658db5d7ac4a7fc889cfa57682 /railties | |
| parent | c7c3eac762ed46f1eb165f666916ed52abd2ab3f (diff) | |
| download | rails-6268fcdc3083496d3336cfcecac2868e17f8d3b6.tar.gz rails-6268fcdc3083496d3336cfcecac2868e17f8d3b6.tar.bz2 rails-6268fcdc3083496d3336cfcecac2868e17f8d3b6.zip | |
Fix the test_framework generator tests
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index c5cb7b2d09..0cf39636ac 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -91,6 +91,8 @@ module Rails def method_missing(method, *args) method = method.to_s.sub(/=$/, '').to_sym + return @options[method] if args.empty? + if method == :rails namespace, configuration = :rails, args.shift elsif args.first.is_a?(Hash) diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index ccf338bb6c..421f3df474 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -58,6 +58,7 @@ module Rails :scaffold_controller => :scaffold_controller, :singleton => false, :stylesheets => true, + :test_framework => nil, :template_engine => :erb }, diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 3cd16a69f9..d17be5b964 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -9,7 +9,7 @@ Rails.application.config.root = Rails.root require 'rails/generators' require 'rails/generators/test_case' - +Rails::Generators.configure! require 'active_record' require 'action_dispatch' |