kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed the session name generated by the app_generator. Also refactored the corresponding test suites to be cleaner. [#5434 state:resolved]

Browse source 
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Fred Wu 2010-08-25 11:36:07 +10:00 committed by José Valim
parent 3e22e0b025
commit 83f4507cf1
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
railties/lib/rails/generators/rails/app/app_generator.rb
View file

@ -355,6 +355,8 @@ module Rails
def app_name def app_name
@app_name ||= File.basename(destination_root) @app_name ||= File.basename(destination_root)
end end
alias_method :defined_app_name, :app_name
def defined_app_const_base def defined_app_const_base
Rails.respond_to?(:application) && defined?(Rails::Application) && Rails.respond_to?(:application) && defined?(Rails::Application) &&
@ -362,6 +364,7 @@ module Rails
end end
def app_const_base def app_const_base
defined_app_name # ensures the correct app_name if it's already defined
@app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize
end end

27
railties/test/generators/app_generator_test.rb
View file

@ -45,6 +45,12 @@ class AppGeneratorTest < Rails::Generators::TestCase
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')
Kernel::silence_warnings do
Thor::Base.shell.send(:attr_accessor, :always_force)
@shell = Thor::Base.shell.new
@shell.send(:always_force=, true)
end
end end
def teardown def teardown
@ -118,17 +124,26 @@ class AppGeneratorTest < Rails::Generators::TestCase
FileUtils.mv(app_root, app_moved_root) FileUtils.mv(app_root, app_moved_root)
# forces the shell to automatically overwrite all files
Thor::Base.shell.send(:attr_accessor, :always_force)
shell = Thor::Base.shell.new
shell.send(:always_force=, true)
generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
:destination_root => app_moved_root, :shell => shell :destination_root => app_moved_root, :shell => @shell
generator.send(:app_const) generator.send(:app_const)
silence(:stdout){ generator.send(:create_config_files) } silence(:stdout){ generator.send(:create_config_files) }
assert_file "myapp_moved/config/environment.rb", /Myapp::Application\.initialize!/ assert_file "myapp_moved/config/environment.rb", /Myapp::Application\.initialize!/
end end
def test_rails_update_generates_correct_session_key
app_root = File.join(destination_root, 'myapp')
run_generator [app_root]
Rails.application.config.root = app_root
Rails.application.class.stubs(:name).returns("Myapp")
Rails.application.stubs(:is_a?).returns(Rails::Application)
generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, :destination_root => app_root, :shell => @shell
generator.send(:app_const)
silence(:stdout){ generator.send(:create_config_files) }
assert_file "myapp/config/initializers/session_store.rb", /_myapp_session/
end
def test_application_names_are_not_singularized def test_application_names_are_not_singularized
run_generator [File.join(destination_root, "hats")] run_generator [File.join(destination_root, "hats")]