3 files changed, 82 insertions, 1 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 2b593005a2..e1eee71a9e 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -1,8 +1,9 @@
 require 'isolation/abstract_unit'
+require 'active_support/core_ext/kernel/reporting'
 require 'rack/test'
 
 module ApplicationTests
-  class RoutingTest < Test::Unit::TestCase
+  class AssetsTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods
 
@@ -34,6 +35,45 @@ module ApplicationTests
       assert_match "alert()", last_response.body
     end
 
+    test "assets do not require compressors until it is used" do
+      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+      ENV["RAILS_ENV"] = "production"
+      require "#{app_path}/config/environment"
+
+      assert !defined?(Uglifier)
+      get "/assets/demo.js"
+      assert_match "alert()", last_response.body
+      assert defined?(Uglifier)
+    end
+
+    test "assets are compiled properly" do
+      app_file "app/assets/javascripts/application.js", "alert();"
+      app_file "app/assets/javascripts/foo/application.js", "alert();"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
+      end
+      files = Dir["#{app_path}/public/assets/application-*.js"]
+      files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+      files.each do |file|
+        assert_not_nil file, "Expected application.js asset to be generated, but none found"
+        assert_equal "alert();\n", File.read(file)
+      end
+    end
+
+    test "assets are cleaned up properly" do
+      app_file "public/assets/application.js", "alert();"
+      app_file "public/assets/application.css", "a { color: green; }"
+      app_file "public/assets/subdir/broken.png", "not really an image file"
+
+      capture(:stdout) do
+        Dir.chdir(app_path){ `bundle exec rake assets:clean` }
+      end
+
+      files = Dir["#{app_path}/public/assets/**/*"]
+      assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
+    end
+
     test "does not stream session cookies back" do
       app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 477dada820..2547863d12 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -39,6 +39,21 @@ module ApplicationTests
       FileUtils.rm_rf(new_app) if File.directory?(new_app)
     end
 
+    test "Rails.groups returns available groups" do
+      require "rails"
+
+      Rails.env = "development"
+      assert_equal [:default, "development"], Rails.groups
+      assert_equal [:default, "development", :assets], Rails.groups(:assets => [:development])
+      assert_equal [:default, "development", :assets], Rails.groups(:assets => %w(development))
+
+      Rails.env = "test"
+      assert_equal [:default, "test"], Rails.groups(:assets => [:development])
+
+      ENV["RAILS_GROUPS"] = "javascripts,stylesheets"
+      assert_equal [:default, "test", "javascripts", "stylesheets"], Rails.groups
+    end
+
     test "Rails.application is nil until app is initialized" do
       require 'rails'
       assert_nil Rails.application
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 44ac6615de..b61e2851bf 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -59,6 +59,32 @@ module ApplicationTests
         Dir.chdir(app_path){ `rake stats` }
     end
 
+    def test_rake_test_error_output
+      Dir.chdir(app_path){ `rake db:migrate` }
+      
+      app_file "config/database.yml", <<-RUBY
+        development:
+      RUBY
+      
+      app_file "test/unit/one_unit_test.rb", <<-RUBY
+      RUBY
+      
+      app_file "test/functional/one_functional_test.rb", <<-RUBY
+        raise RuntimeError
+      RUBY
+      
+      app_file "test/integration/one_integration_test.rb", <<-RUBY
+        raise RuntimeError
+      RUBY
+      
+      silence_stderr do
+        output = Dir.chdir(app_path){ `rake test` }
+        assert_match /Errors running test:units! #<ActiveRecord::AdapterNotSpecified/, output
+        assert_match /Errors running test:functionals! #<RuntimeError/, output
+        assert_match /Errors running test:integration! #<RuntimeError/, output
+      end
+    end
+
     def test_rake_routes_output_strips_anchors_from_http_verbs
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do