4 files changed, 110 insertions, 0 deletions
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 78ada58ec8..84cc6e120b 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -125,5 +125,40 @@ module ApplicationTests
         assert_equal expected, c.generators.options
       end
     end
+
+    test "api only generators hide assets, helper, js and css namespaces and set api option" do
+      add_to_config <<-RUBY
+        config.api_only = true
+      RUBY
+
+      # Initialize the application
+      require "#{app_path}/config/environment"
+      Rails.application.load_generators
+
+      assert Rails::Generators.hidden_namespaces.include?("assets")
+      assert Rails::Generators.hidden_namespaces.include?("helper")
+      assert Rails::Generators.hidden_namespaces.include?("js")
+      assert Rails::Generators.hidden_namespaces.include?("css")
+      assert Rails::Generators.options[:rails][:api]
+      assert_equal false, Rails::Generators.options[:rails][:assets]
+      assert_equal false, Rails::Generators.options[:rails][:helper]
+      assert_nil Rails::Generators.options[:rails][:template_engine]
+    end
+
+    test "api only generators allow overriding generator options" do
+      add_to_config <<-RUBY
+      config.generators.helper = true
+      config.api_only = true
+      config.generators.template_engine = :my_template
+      RUBY
+
+      # Initialize the application
+      require "#{app_path}/config/environment"
+      Rails.application.load_generators
+
+      assert Rails::Generators.options[:rails][:api]
+      assert Rails::Generators.options[:rails][:helper]
+      assert_equal :my_template, Rails::Generators.options[:rails][:template_engine]
+    end
   end
 end
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 97b51911d9..af98e08d0e 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -129,6 +129,35 @@ module ApplicationTests
       assert_equal "false", last_response.body
     end
 
+    test "action_controller api executes using all the middleware stack" do
+      add_to_config "config.api_only = true"
+
+      app_file "app/controllers/application_controller.rb", <<-RUBY
+        class ApplicationController < ActionController::API
+        end
+      RUBY
+
+      app_file "app/controllers/omg_controller.rb", <<-RUBY
+        class OmgController < ApplicationController
+          def show
+            render json: { omg: 'omg' }
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          get "/:controller(/:action)"
+        end
+      RUBY
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get 'omg/show'
+      assert_equal '{"omg":"omg"}', last_response.body
+    end
+
     # AD
     test "action_dispatch extensions are applied to ActionDispatch" do
       add_to_config "config.action_dispatch.tld_length = 2"
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 04bd19784a..ce92ebbf66 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -50,6 +50,33 @@ module ApplicationTests
       ], middleware
     end
 
+    test "api middleware stack" do
+      add_to_config "config.api_only = true"
+
+      boot!
+
+      assert_equal [
+        "Rack::Sendfile",
+        "ActionDispatch::Static",
+        "Rack::Lock",
+        "ActiveSupport::Cache::Strategy::LocalCache",
+        "Rack::Runtime",
+        "ActionDispatch::RequestId",
+        "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
+        "ActionDispatch::ShowExceptions",
+        "ActionDispatch::DebugExceptions",
+        "ActionDispatch::RemoteIp",
+        "ActionDispatch::Reloader",
+        "ActionDispatch::Callbacks",
+        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
+        "ActiveRecord::QueryCache",
+        "ActionDispatch::ParamsParser",
+        "Rack::Head",
+        "Rack::ConditionalGet",
+        "Rack::ETag"
+      ], middleware
+    end
+
     test "Rack::Cache is not included by default" do
       boot!
 
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index dd26ec867d..a839a0b9b6 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -194,6 +194,25 @@ module ApplicationTests
       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, 8 assertions, 0 failures, 0 errors/, output)
+      assert_no_match(/Errors running/, output)
+    end
+
     def test_scaffold_with_references_columns_tests_pass_when_belongs_to_is_optional
       app_file "config/initializers/active_record_belongs_to_required_by_default.rb",
         "Rails.application.config.active_record.belongs_to_required_by_default = false"