1 files changed, 58 insertions, 63 deletions

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index eb590da678..317e73245c 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -9,7 +9,6 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
-      FileUtils.rm_rf("#{app_path}/config/environments")
     end
 
     def teardown
@@ -30,11 +29,11 @@ module ApplicationTests
       app_file "config/environment.rb", <<-RUBY
         SuperMiddleware = Struct.new(:app)
 
-        AppTemplate::Application.configure do
+        Rails.application.configure do
           config.middleware.use SuperMiddleware
         end
 
-        AppTemplate::Application.initialize!
+        Rails.application.initialize!
       RUBY
 
       assert_match("SuperMiddleware", Dir.chdir(app_path){ `rake middleware` })
@@ -56,10 +55,8 @@ module ApplicationTests
       assert_match "Doing something...", output
     end
 
-    def test_does_not_explode_when_accessing_a_model_with_eager_load
+    def test_does_not_explode_when_accessing_a_model
       add_to_config <<-RUBY
-        config.eager_load = true
-
         rake_tasks do
           task do_nothing: :environment do
             Hello.new.world
@@ -67,76 +64,72 @@ module ApplicationTests
         end
       RUBY
 
-      app_file "app/models/hello.rb", <<-RUBY
-      class Hello
-        def world
-          puts "Hello world"
+      app_file 'app/models/hello.rb', <<-RUBY
+        class Hello
+          def world
+            puts 'Hello world'
+          end
         end
-      end
       RUBY
 
-      output = Dir.chdir(app_path){ `rake do_nothing` }
-      assert_match "Hello world", output
-    end
-
-    def test_code_statistics_sanity
-      assert_match "Code LOC: 5     Test LOC: 0     Code to Test Ratio: 1:0.0",
-        Dir.chdir(app_path){ `rake stats` }
+      output = Dir.chdir(app_path) { `rake do_nothing` }
+      assert_match 'Hello world', output
     end
 
-    def test_rake_test_uncommitted_always_find_git_in_parent_dir
-      return "FIXME :'("
-      app_name = File.basename(app_path)
-      app_dir = File.dirname(app_path)
-      moved_app_name = app_name + '_moved'
-
-      Dir.chdir(app_dir) do
-        # Go from "./app/" to "./app/app_moved"
-        FileUtils.mv(app_name, moved_app_name)
-        FileUtils.mkdir(app_name)
-        FileUtils.mv(moved_app_name, app_name)
-        # Initialize the git repository and start the test.
-        Dir.chdir(app_name) do
-          `git init`
-          Dir.chdir(moved_app_name){ `rake db:migrate` }
-          silence_stderr { Dir.chdir(moved_app_name) { `rake test:uncommitted` } }
-          assert_equal 0, $?.exitstatus
+    def test_should_not_eager_load_model_for_rake
+      add_to_config <<-RUBY
+        rake_tasks do
+          task do_nothing: :environment do
+          end
         end
-      end
-    end
+      RUBY
+
+      add_to_env_config 'production', <<-RUBY
+        config.eager_load = true
+      RUBY
+
+      app_file 'app/models/hello.rb', <<-RUBY
+        raise 'should not be pre-required for rake even eager_load=true'
+      RUBY
 
-    def test_rake_test_uncommitted_fails_with_no_scm
-      Dir.chdir(app_path){ `rake db:migrate` }
       Dir.chdir(app_path) do
-        silence_stderr { `rake test:uncommitted` }
-        assert_equal 1, $?.exitstatus
+        assert system('rake do_nothing RAILS_ENV=production'),
+               'should not be pre-required for rake even eager_load=true'
       end
     end
 
-    def test_rake_test_deprecation_messages
-      Dir.chdir(app_path){ `rails generate scaffold user name:string` }
-      Dir.chdir(app_path){ `rake db:migrate` }
-
-      %w(recent uncommitted).each do |test_suit_name|
-        output = Dir.chdir(app_path) { `rake test:#{test_suit_name} 2>&1` }
-        assert_match(/DEPRECATION WARNING: `rake test:#{test_suit_name}` is deprecated/, output)
-      end
+    def test_code_statistics_sanity
+      assert_match "Code LOC: 5     Test LOC: 0     Code to Test Ratio: 1:0.0",
+        Dir.chdir(app_path){ `rake stats` }
     end
 
     def test_rake_routes_calls_the_route_inspector
       app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
+        Rails.application.routes.draw do
+          get '/cart', to: 'cart#show'
+        end
+      RUBY
+
+      output = Dir.chdir(app_path){ `rake routes` }
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
+    end
+
+    def test_rake_routes_with_controller_environment
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
           get '/cart', to: 'cart#show'
+          get '/basketball', to: 'basketball#index'
         end
       RUBY
 
+      ENV['CONTROLLER'] = 'cart'
       output = Dir.chdir(app_path){ `rake routes` }
-      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart GET /cart(.:format) cart#show\n", output
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
     def test_rake_routes_displays_message_when_no_routes_are_defined
       app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
+        Rails.application.routes.draw do
         end
       RUBY
 
@@ -194,20 +187,20 @@ module ApplicationTests
     def test_scaffold_tests_pass_by_default
       output = Dir.chdir(app_path) do
         `rails generate scaffold user username:string password:string;
-         bundle exec rake db:migrate db:test:clone test`
+         bundle exec rake db:migrate test`
       end
 
-      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
     def test_scaffold_with_references_columns_tests_pass_by_default
       output = Dir.chdir(app_path) do
         `rails generate scaffold LineItems product:references cart:belongs_to;
-         bundle exec rake db:migrate db:test:clone test`
+         bundle exec rake db:migrate test`
       end
 
-      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
@@ -215,7 +208,8 @@ module ApplicationTests
       add_to_config "config.active_record.schema_format = :sql"
       output = Dir.chdir(app_path) do
         `rails generate scaffold user username:string;
-         bundle exec rake db:migrate db:test:clone 2>&1 --trace`
+         bundle exec rake db:migrate;
+         bundle exec rake db:test:clone 2>&1 --trace`
       end
       assert_match(/Execute db:test:clone_structure/, output)
     end
@@ -224,7 +218,8 @@ module ApplicationTests
       add_to_config "config.active_record.schema_format = :sql"
       output = Dir.chdir(app_path) do
         `rails generate scaffold user username:string;
-         bundle exec rake db:migrate db:test:prepare 2>&1 --trace`
+         bundle exec rake db:migrate;
+         bundle exec rake db:test:prepare 2>&1 --trace`
       end
       assert_match(/Execute db:test:load_structure/, output)
     end
@@ -234,7 +229,7 @@ module ApplicationTests
         # ensure we have a schema_migrations table to dump
         `bundle exec rake db:migrate db:structure:dump DB_STRUCTURE=db/my_structure.sql`
       end
-      assert File.exists?(File.join(app_path, 'db', 'my_structure.sql'))
+      assert File.exist?(File.join(app_path, 'db', 'my_structure.sql'))
     end
 
     def test_rake_dump_structure_should_be_called_twice_when_migrate_redo
@@ -255,24 +250,24 @@ module ApplicationTests
          rails generate model product name:string;
          bundle exec rake db:migrate db:schema:cache:dump`
       end
-      assert File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
+      assert File.exist?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
     def test_rake_clear_schema_cache
       Dir.chdir(app_path) do
         `bundle exec rake db:schema:cache:dump db:schema:cache:clear`
       end
-      assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
+      assert !File.exist?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
     def test_copy_templates
       Dir.chdir(app_path) do
         `bundle exec rake rails:templates:copy`
         %w(controller mailer scaffold).each do |dir|
-          assert File.exists?(File.join(app_path, 'lib', 'templates', 'erb', dir))
+          assert File.exist?(File.join(app_path, 'lib', 'templates', 'erb', dir))
         end
         %w(controller helper scaffold_controller assets).each do |dir|
-          assert File.exists?(File.join(app_path, 'lib', 'templates', 'rails', dir))
+          assert File.exist?(File.join(app_path, 'lib', 'templates', 'rails', dir))
         end
       end
     end