1 files changed, 29 insertions, 3 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 2bff21dae5..4c1913f0cc 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -99,7 +99,7 @@ module ApplicationTests
     end
 
     def test_code_statistics_sanity
-      assert_match "Code LOC: 5     Test LOC: 0     Code to Test Ratio: 1:0.0",
+      assert_match "Code LOC: 7     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `rake stats` }
     end
 
@@ -190,7 +190,26 @@ module ApplicationTests
          bundle exec rake db:migrate test`
       end
 
-      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 12 assertions, 0 failures, 0 errors/, output)
+      assert_no_match(/Errors running/, output)
+    end
+
+    def test_api_scaffold_tests_pass_by_default
+      add_to_config <<-RUBY
+        config.api_only = true
+      RUBY
+
+      app_file "app/controllers/application_controller.rb", <<-RUBY
+        class ApplicationController < ActionController::API
+        end
+      RUBY
+
+      output = Dir.chdir(app_path) do
+        `rails generate scaffold user username:string password:string;
+         bundle exec rake db:migrate test`
+      end
+
+      assert_match(/5 runs, 7 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
@@ -203,7 +222,7 @@ module ApplicationTests
          bundle exec rake db:migrate test`
       end
 
-      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 12 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
@@ -285,5 +304,12 @@ module ApplicationTests
 
       assert_match(/Hello, World!/, output)
     end
+
+    def test_tmp_clear_should_work_if_folder_missing
+      FileUtils.remove_dir("#{app_path}/tmp")
+      errormsg = Dir.chdir(app_path) { `bundle exec rake tmp:clear` }
+      assert_predicate $?, :success?
+      assert_empty errormsg
+    end
   end
 end