Ensures the app generator generates the correct @app_name. [#5434 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -353,18 +353,21 @@ module Rails
       end
 
       def app_name
-        @app_name ||= File.basename(destination_root)
+        @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
+      end
+
+      def defined_app_name
+        defined_app_const_base.underscore
       end
-      
-      alias_method :defined_app_name, :app_name
 
       def defined_app_const_base
         Rails.respond_to?(:application) && defined?(Rails::Application) &&
           Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, "")
       end
 
+      alias :defined_app_const_base? :defined_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
       end
 

railties/test/generators/app_generator_test.rb

@@ -129,6 +129,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     generator.send(:app_const)
     silence(:stdout){ generator.send(:create_config_files) }
     assert_file "myapp_moved/config/environment.rb", /Myapp::Application\.initialize!/
+    assert_file "myapp_moved/config/initializers/session_store.rb", /_myapp_session/
   end
   
   def test_rails_update_generates_correct_session_key