Ticket #10570: application_to_application_controller_forgiving_version.diff

activesupport/test/dependencies_test.rb

@@ -446 +446 @@
-
-  def test_application_should_special_case_application_controller
-    with_loading 'autoloading_fixtures' do
-
+_controller
-      assert_equal 10, ApplicationController
-      assert Dependencies.autoloaded?(:ApplicationController)
-    end

railties/test/initializer_test.rb

@@ -136 +136 @@
-  end
-end
-
+uses_mocha "Checking application.rb tests" do
+  class Initializer_check_application_file_name_Test < Test::Unit::TestCase
+    def test_abort_if_application_file_exists
+      Rails::Initializer.any_instance.expects(:puts)
+      File.expects(:exist?).returns true
+      Rails::Initializer.run(:check_application_file_name)
+    end
+
+    def test_no_abort_if_application_file_does_not_exist
+      Rails::Initializer.any_instance.expects(:puts).never
+      File.expects(:exist?).returns false
+      Rails::Initializer.run(:check_application_file_name)
+    end
+  end
+end
+
-uses_mocha "Initializer plugin loading tests" do
-  require File.dirname(__FILE__) + '/plugin_test_helper'
-

railties/helpers/application.rb

@@ -1 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store
-  protect_from_forgery # :secret => '<%= app_secret %>'
-end

railties/helpers/application_controller.rb

@@ +1 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+
+  # See ActionController::RequestForgeryProtection for details
+  # Uncomment the :secret if you're not using the cookie session store
+  protect_from_forgery # :secret => '<%= app_secret %>'
+end

railties/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -48 +48 @@
-      m.file "README",         "README"
-
-      # Application
-.rb",        "app/controllers/application
+_controller.rb", "app/controllers/application_controller
-      m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-      m.template "helpers/test_helper.rb",        "test/test_helper.rb"
-

railties/lib/console_with_helpers.rb

@@ -16 +16 @@
-  end
-end
-
-
+ rescue nil
-
-class << helper 
-  include_all_modules_from ActionView

railties/lib/initializer.rb

@@ -61 +61 @@
-    # in order (view execution order in source).
-    def process
-      check_ruby_version
+      check_application_file_name
-      set_load_path
-      
-      require_frameworks
@@ -106 +107 @@
-      require 'ruby_version_check'
-    end
-
+    # Check for application.rb and suggest rename if it exists
+    def check_application_file_name
+      puts 'Please rename app/controllers/application.rb to app/controllers/application_controller.rb' if File.exist?("#{RAILS_ROOT}/app/controllers/application.rb")
+    end
+
-    # Set the <tt>$LOAD_PATH</tt> based on the value of
-    # Configuration#load_paths. Duplicates are removed.
-    def set_load_path

railties/lib/test_help.rb

@@ -1 @@
-
+ rescue nil
-
-# Make double-sure the RAILS_ENV is set to test,
-# so fixtures are loaded to the right database

railties/lib/commands/performance/request.rb

@@ -1 +1 @@
-#!/usr/bin/env ruby
-require 'config/environment'
-
+ rescue nil
-require 'action_controller/request_profiler'
-
-ActionController::RequestProfiler.run(ARGV)