提交 f8294cb8 编写于 作者: P Piotr Sarnacki 提交者: José Valim

Fix app and actions generators tests

Normally Rails.application is an instance, but for those
tests Rails.application needs to be class.
Signed-off-by: NJosé Valim <jose.valim@gmail.com>
上级 0134c5cc
...@@ -7,11 +7,16 @@ class ActionsTest < Rails::Generators::TestCase ...@@ -7,11 +7,16 @@ class ActionsTest < Rails::Generators::TestCase
arguments [destination_root] arguments [destination_root]
def setup def setup
Rails.application = TestApp::Application
super super
@git_plugin_uri = 'git://github.com/technoweenie/restful-authentication.git' @git_plugin_uri = 'git://github.com/technoweenie/restful-authentication.git'
@svn_plugin_uri = 'svn://svnhub.com/technoweenie/restful-authentication/trunk' @svn_plugin_uri = 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
end end
def teardown
Rails.application = TestApp::Application.instance
end
def test_invoke_other_generator_with_shortcut def test_invoke_other_generator_with_shortcut
action :invoke, 'model', ['my_model'] action :invoke, 'model', ['my_model']
assert_file 'app/models/my_model.rb', /MyModel/ assert_file 'app/models/my_model.rb', /MyModel/
......
...@@ -42,6 +42,7 @@ class AppGeneratorTest < Rails::Generators::TestCase ...@@ -42,6 +42,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
arguments [destination_root] arguments [destination_root]
def setup def setup
Rails.application = TestApp::Application
super super
Rails::Generators::AppGenerator.instance_variable_set('@desc', nil) Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
@bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle') @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
...@@ -56,6 +57,7 @@ def setup ...@@ -56,6 +57,7 @@ def setup
def teardown def teardown
super super
Rails::Generators::AppGenerator.instance_variable_set('@desc', nil) Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
Rails.application = TestApp::Application.instance
end end
def test_application_skeleton_is_created def test_application_skeleton_is_created
...@@ -268,6 +270,7 @@ class CustomAppGeneratorTest < Rails::Generators::TestCase ...@@ -268,6 +270,7 @@ class CustomAppGeneratorTest < Rails::Generators::TestCase
arguments [destination_root] arguments [destination_root]
def setup def setup
Rails.application = TestApp::Application
super super
Rails::Generators::AppGenerator.instance_variable_set('@desc', nil) Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
@bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle') @bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
...@@ -277,6 +280,7 @@ def teardown ...@@ -277,6 +280,7 @@ def teardown
super super
Rails::Generators::AppGenerator.instance_variable_set('@desc', nil) Rails::Generators::AppGenerator.instance_variable_set('@desc', nil)
Object.class_eval { remove_const :AppBuilder if const_defined?(:AppBuilder) } Object.class_eval { remove_const :AppBuilder if const_defined?(:AppBuilder) }
Rails.application = TestApp::Application.instance
end end
def test_builder_option_with_empty_app_builder def test_builder_option_with_empty_app_builder
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册