Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix the test_framework generator tests

  • Loading branch information...
commit 6268fcdc3083496d3336cfcecac2868e17f8d3b6 1 parent c7c3eac
Carl Lerche authored
View
2  railties/lib/rails/configuration.rb
@@ -91,6 +91,8 @@ def initialize
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)
View
1  railties/lib/rails/generators.rb
@@ -58,6 +58,7 @@ module Generators
:scaffold_controller => :scaffold_controller,
:singleton => false,
:stylesheets => true,
+ :test_framework => nil,
:template_engine => :erb
},
View
2  railties/test/generators/generators_test_helper.rb
@@ -9,7 +9,7 @@ def self.root
require 'rails/generators'
require 'rails/generators/test_case'
-
+Rails::Generators.configure!
require 'active_record'
require 'action_dispatch'
Please sign in to comment.
Something went wrong with that request. Please try again.