Remove the ability for engines to serve assets from the public directory.

2 files changed, 1 insertions, 292 deletions

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 530863fd08..7605984684 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -187,6 +187,7 @@ module RailtiesTest
         end
       RUBY
 
+      require "rack/file"
       boot_rails
 
       env = Rack::MockRequest.env_for("/")
@@ -198,195 +199,6 @@ module RailtiesTest
       assert_equal Rails.application.routes, env['action_dispatch.routes']
     end
 
-    test "it allows to set asset_path" do
-      add_to_config("config.assets.enabled = false")
-
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        class Bukkits
-          class Engine < ::Rails::Engine
-          end
-        end
-      RUBY
-
-      @plugin.write "config/routes.rb", <<-RUBY
-        Bukkits::Engine.routes.draw do
-          match "/foo" => "foo#index"
-        end
-      RUBY
-
-      @plugin.write "app/controllers/foo_controller.rb", <<-RUBY
-        class FooController < ActionController::Base
-          def index
-            render :index
-          end
-        end
-      RUBY
-
-      @plugin.write "app/views/foo/index.html.erb", <<-ERB
-        <%= image_path("foo.png") %>
-        <%= javascript_include_tag("foo") %>
-        <%= stylesheet_link_tag("foo") %>
-      ERB
-
-      app_file "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          mount Bukkits::Engine => "/bukkits"
-        end
-      RUBY
-
-      add_to_config 'config.asset_path = "/omg%s"'
-
-      boot_rails
-
-      # should set asset_path with engine name by default
-      assert_equal "/bukkits_engine%s", ::Bukkits::Engine.config.asset_path
-
-      ::Bukkits::Engine.config.asset_path = "/bukkits%s"
-
-      get("/bukkits/foo")
-      stripped_body = last_response.body.split("\n").map(&:strip).join
-
-      expected =  "/omg/bukkits/images/foo.png" +
-                  "<script src=\"/omg/bukkits/javascripts/foo.js\" type=\"text/javascript\"></script>" +
-                  "<link href=\"/omg/bukkits/stylesheets/foo.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />"
-      assert_equal expected, stripped_body
-    end
-
-    test "default application's asset_path" do
-      @plugin.write "config/routes.rb", <<-RUBY
-        Bukkits::Engine.routes.draw do
-          match "/foo" => "foo#index"
-        end
-      RUBY
-
-      @plugin.write "app/controllers/foo_controller.rb", <<-RUBY
-        class FooController < ActionController::Base
-          def index
-            render :inline => '<%= image_path("foo.png") %>'
-          end
-        end
-      RUBY
-
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          mount Bukkits::Engine => "/bukkits"
-        end
-      RUBY
-
-      boot_rails
-
-      get("/bukkits/foo")
-      assert_equal "/bukkits/images/foo.png", last_response.body.strip
-    end
-
-    test "engine's files are served via ActionDispatch::Static" do
-      add_to_config "config.serve_static_assets = true"
-
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        class Bukkits
-          class Engine < ::Rails::Engine
-            engine_name :bukkits
-          end
-        end
-      RUBY
-
-      @plugin.write "public/bukkits.html", "/bukkits/bukkits.html"
-      app_file "public/app.html", "/app.html"
-      app_file "public/bukkits/file_from_app.html", "/bukkits/file_from_app.html"
-
-      boot_rails
-
-      get("/app.html")
-      assert_equal File.read(File.join(app_path, "public/app.html")), last_response.body
-
-      get("/bukkits/bukkits.html")
-      assert_equal File.read(File.join(@plugin.path, "public/bukkits.html")), last_response.body
-
-      get("/bukkits/file_from_app.html")
-      assert_equal File.read(File.join(app_path, "public/bukkits/file_from_app.html")), last_response.body
-    end
-
-    test "an applications files are given priority over an engines files when served via ActionDispatch::Static" do
-      add_to_config "config.serve_static_assets = true"
-
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        class Bukkits
-          class Engine < ::Rails::Engine
-            engine_name :bukkits
-          end
-        end
-      RUBY
-
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          mount Bukkits::Engine => "/bukkits"
-        end
-      RUBY
-
-      @plugin.write "public/bukkits.html", "in engine"
-
-      app_file "public/bukkits/bukkits.html", "in app"
-
-      boot_rails
-
-      get('/bukkits/bukkits.html')
-
-      assert_equal 'in app', last_response.body.strip
-    end
-
-    test "shared engine should include application's helpers and own helpers" do
-      app_file "config/routes.rb", <<-RUBY
-        AppTemplate::Application.routes.draw do
-          match "/foo" => "bukkits/foo#index", :as => "foo"
-          match "/foo/show" => "bukkits/foo#show"
-          match "/foo/bar" => "bukkits/foo#bar"
-        end
-      RUBY
-
-      app_file "app/helpers/some_helper.rb", <<-RUBY
-        module SomeHelper
-          def something
-            "Something... Something... Something..."
-          end
-        end
-      RUBY
-
-      @plugin.write "app/helpers/bar_helper.rb", <<-RUBY
-        module BarHelper
-          def bar
-            "It's a bar."
-          end
-        end
-      RUBY
-
-      @plugin.write "app/controllers/bukkits/foo_controller.rb", <<-RUBY
-        class Bukkits::FooController < ActionController::Base
-          def index
-            render :inline => "<%= something %>"
-          end
-
-          def show
-            render :text => foo_path
-          end
-
-          def bar
-            render :inline => "<%= bar %>"
-          end
-        end
-      RUBY
-
-      boot_rails
-
-      get("/foo")
-      assert_equal "Something... Something... Something...", last_response.body
-
-      get("/foo/show")
-      assert_equal "/foo", last_response.body
-
-      get("/foo/bar")
-      assert_equal "It's a bar.", last_response.body
-    end
-
     test "isolated engine should include only its own routes and helpers" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module Bukkits
@@ -772,71 +584,6 @@ module RailtiesTest
       assert_equal Bukkits::Engine.instance, Rails::Engine.find(engine_path)
     end
 
-    test "ensure that engine properly sets assets directories" do
-      add_to_config("config.action_dispatch.show_exceptions = false")
-      add_to_config("config.serve_static_assets = true")
-      add_to_config("config.assets.enabled = false")
-
-      @plugin.write "lib/bukkits.rb", <<-RUBY
-        module Bukkits
-          class Engine < ::Rails::Engine
-            isolate_namespace Bukkits
-          end
-        end
-      RUBY
-
-      @plugin.write "public/stylesheets/foo.css", ""
-      @plugin.write "public/javascripts/foo.js", ""
-
-      @plugin.write "app/views/layouts/bukkits/application.html.erb", <<-RUBY
-        <%= stylesheet_link_tag :all %>
-        <%= javascript_include_tag :all %>
-        <%= yield %>
-      RUBY
-
-      @plugin.write "app/controllers/bukkits/home_controller.rb", <<-RUBY
-        module Bukkits
-          class HomeController < ActionController::Base
-            def index
-              render :text => "Good morning!", :layout => "bukkits/application"
-            end
-          end
-        end
-      RUBY
-
-      @plugin.write "config/routes.rb", <<-RUBY
-        Bukkits::Engine.routes.draw do
-          match "/home" => "home#index"
-        end
-      RUBY
-
-      app_file "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          mount Bukkits::Engine => "/bukkits"
-        end
-      RUBY
-
-      require 'rack/test'
-      extend Rack::Test::Methods
-
-      boot_rails
-
-      require "#{rails_root}/config/environment"
-
-      assert_equal File.join(@plugin.path, "public"),             Bukkits::HomeController.assets_dir
-      assert_equal File.join(@plugin.path, "public/stylesheets"), Bukkits::HomeController.stylesheets_dir
-      assert_equal File.join(@plugin.path, "public/javascripts"), Bukkits::HomeController.javascripts_dir
-
-      assert_equal File.join(app_path, "public"),             ActionController::Base.assets_dir
-      assert_equal File.join(app_path, "public/stylesheets"), ActionController::Base.stylesheets_dir
-      assert_equal File.join(app_path, "public/javascripts"), ActionController::Base.javascripts_dir
-
-      get "/bukkits/home"
-
-      assert_match %r{bukkits/stylesheets/foo.css}, last_response.body
-      assert_match %r{bukkits/javascripts/foo.js}, last_response.body
-    end
-
   private
     def app
       Rails.application
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 46bab2a47b..b2b18938ae 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -10,44 +10,6 @@ module RailtiesTest
       @app ||= Rails.application
     end
 
-    def test_install_migrations_and_assets
-      @plugin.write "public/javascripts/foo.js", "doSomething()"
-
-      @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
-        class CreateUsers < ActiveRecord::Migration
-        end
-      RUBY
-
-      app_file "db/migrate/1_create_sessions.rb", <<-RUBY
-        class CreateSessions < ActiveRecord::Migration
-        end
-      RUBY
-
-      add_to_config "ActiveRecord::Base.timestamped_migrations = false"
-
-      Dir.chdir(app_path) do
-        `rake bukkits:install`
-        assert File.exists?("#{app_path}/db/migrate/2_create_users.rb")
-        assert File.exists?(app_path("public/bukkits/javascripts/foo.js"))
-      end
-    end
-
-    def test_copying_public
-      @plugin.write "public/javascripts/foo.js", "doSomething()"
-      @plugin.write "public/stylesheets/foo.css", "h1 { font-size: 10000px }"
-      @plugin.write "public/images/img.png", ""
-
-      Dir.chdir(app_path) do
-        `rake bukkits:install:public --trace`
-
-        assert File.exists?(app_path("public/bukkits/javascripts/foo.js"))
-        assert_equal "doSomething()\n", File.read(app_path("public/bukkits/javascripts/foo.js"))
-        assert File.exists?(app_path("public/bukkits/stylesheets/foo.css"))
-        assert_equal "h1 { font-size: 10000px }\n", File.read(app_path("public/bukkits/stylesheets/foo.css"))
-        assert File.exists?(app_path("public/bukkits/images/img.png"))
-      end
-    end
-
     def test_serving_sprockets_assets
       @plugin.write "app/assets/javascripts/engine.js.coffee", "square = (x) -> x * x"