10 files changed, 314 insertions, 0 deletions
diff --git a/actionpack/test/controller/api/conditional_get_test.rb b/actionpack/test/controller/api/conditional_get_test.rb
new file mode 100644
index 0000000000..fd1997f26c
--- /dev/null
+++ b/actionpack/test/controller/api/conditional_get_test.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "active_support/core_ext/integer/time"
+require "active_support/core_ext/numeric/time"
+
+class ConditionalGetApiController < ActionController::API
+  before_action :handle_last_modified_and_etags, only: :two
+
+  def one
+    if stale?(last_modified: Time.now.utc.beginning_of_day, etag: [:foo, 123])
+      render plain: "Hi!"
+    end
+  end
+
+  def two
+    render plain: "Hi!"
+  end
+
+  private
+
+    def handle_last_modified_and_etags
+      fresh_when(last_modified: Time.now.utc.beginning_of_day, etag: [ :foo, 123 ])
+    end
+end
+
+class ConditionalGetApiTest < ActionController::TestCase
+  tests ConditionalGetApiController
+
+  def setup
+    @last_modified = Time.now.utc.beginning_of_day.httpdate
+  end
+
+  def test_request_gets_last_modified
+    get :two
+    assert_equal @last_modified, @response.headers["Last-Modified"]
+    assert_response :success
+  end
+
+  def test_request_obeys_last_modified
+    @request.if_modified_since = @last_modified
+    get :two
+    assert_response :not_modified
+  end
+
+  def test_last_modified_works_with_less_than_too
+    @request.if_modified_since = 5.years.ago.httpdate
+    get :two
+    assert_response :success
+  end
+
+  def test_request_not_modified
+    @request.if_modified_since = @last_modified
+    get :one
+    assert_equal 304, @response.status.to_i
+    assert @response.body.blank?
+    assert_equal @last_modified, @response.headers["Last-Modified"]
+  end
+end
diff --git a/actionpack/test/controller/api/data_streaming_test.rb b/actionpack/test/controller/api/data_streaming_test.rb
new file mode 100644
index 0000000000..6446ff9e40
--- /dev/null
+++ b/actionpack/test/controller/api/data_streaming_test.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+module TestApiFileUtils
+  def file_path() __FILE__ end
+  def file_data() @data ||= File.open(file_path, "rb") { |f| f.read } end
+end
+
+class DataStreamingApiController < ActionController::API
+  include TestApiFileUtils
+
+  def one; end
+  def two
+    send_data(file_data, {})
+  end
+end
+
+class DataStreamingApiTest < ActionController::TestCase
+  include TestApiFileUtils
+  tests DataStreamingApiController
+
+  def test_data
+    response = process("two")
+    assert_kind_of String, response.body
+    assert_equal file_data, response.body
+  end
+end
diff --git a/actionpack/test/controller/api/force_ssl_test.rb b/actionpack/test/controller/api/force_ssl_test.rb
new file mode 100644
index 0000000000..07459c3753
--- /dev/null
+++ b/actionpack/test/controller/api/force_ssl_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class ForceSSLApiController < ActionController::API
+  force_ssl
+
+  def one; end
+  def two
+    head :ok
+  end
+end
+
+class ForceSSLApiTest < ActionController::TestCase
+  tests ForceSSLApiController
+
+  def test_redirects_to_https
+    get :two
+    assert_response 301
+    assert_equal "https://test.host/force_ssl_api/two", redirect_to_url
+  end
+end
diff --git a/actionpack/test/controller/api/implicit_render_test.rb b/actionpack/test/controller/api/implicit_render_test.rb
new file mode 100644
index 0000000000..288fb333b0
--- /dev/null
+++ b/actionpack/test/controller/api/implicit_render_test.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class ImplicitRenderAPITestController < ActionController::API
+  def empty_action
+  end
+end
+
+class ImplicitRenderAPITest < ActionController::TestCase
+  tests ImplicitRenderAPITestController
+
+  def test_implicit_no_content_response
+    get :empty_action
+    assert_response :no_content
+  end
+end
diff --git a/actionpack/test/controller/api/params_wrapper_test.rb b/actionpack/test/controller/api/params_wrapper_test.rb
new file mode 100644
index 0000000000..814c24bfd8
--- /dev/null
+++ b/actionpack/test/controller/api/params_wrapper_test.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class ParamsWrapperForApiTest < ActionController::TestCase
+  class UsersController < ActionController::API
+    attr_accessor :last_parameters
+
+    wrap_parameters :person, format: [:json]
+
+    def test
+      self.last_parameters = params.except(:controller, :action).to_unsafe_h
+      head :ok
+    end
+  end
+
+  class Person; end
+
+  tests UsersController
+
+  def test_specify_wrapper_name
+    @request.env["CONTENT_TYPE"] = "application/json"
+    post :test, params: { "username" => "sikachu" }
+
+    expected = { "username" => "sikachu", "person" => { "username" => "sikachu" } }
+    assert_equal expected, @controller.last_parameters
+  end
+end
diff --git a/actionpack/test/controller/api/redirect_to_test.rb b/actionpack/test/controller/api/redirect_to_test.rb
new file mode 100644
index 0000000000..f8230dd6a9
--- /dev/null
+++ b/actionpack/test/controller/api/redirect_to_test.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class RedirectToApiController < ActionController::API
+  def one
+    redirect_to action: "two"
+  end
+
+  def two; end
+end
+
+class RedirectToApiTest < ActionController::TestCase
+  tests RedirectToApiController
+
+  def test_redirect_to
+    get :one
+    assert_response :redirect
+    assert_equal "http://test.host/redirect_to_api/two", redirect_to_url
+  end
+end
diff --git a/actionpack/test/controller/api/renderers_test.rb b/actionpack/test/controller/api/renderers_test.rb
new file mode 100644
index 0000000000..e7a9a4b2da
--- /dev/null
+++ b/actionpack/test/controller/api/renderers_test.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "active_support/core_ext/hash/conversions"
+
+class RenderersApiController < ActionController::API
+  class Model
+    def to_json(options = {})
+      { a: "b" }.to_json(options)
+    end
+
+    def to_xml(options = {})
+      { a: "b" }.to_xml(options)
+    end
+  end
+
+  def one
+    render json: Model.new
+  end
+
+  def two
+    render xml: Model.new
+  end
+
+  def plain
+    render plain: "Hi from plain", status: 500
+  end
+end
+
+class RenderersApiTest < ActionController::TestCase
+  tests RenderersApiController
+
+  def test_render_json
+    get :one
+    assert_response :success
+    assert_equal({ a: "b" }.to_json, @response.body)
+  end
+
+  def test_render_xml
+    get :two
+    assert_response :success
+    assert_equal({ a: "b" }.to_xml, @response.body)
+  end
+
+  def test_render_plain
+    get :plain
+    assert_response :internal_server_error
+    assert_equal("Hi from plain", @response.body)
+  end
+end
diff --git a/actionpack/test/controller/api/url_for_test.rb b/actionpack/test/controller/api/url_for_test.rb
new file mode 100644
index 0000000000..aa3428bc85
--- /dev/null
+++ b/actionpack/test/controller/api/url_for_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class UrlForApiController < ActionController::API
+  def one; end
+  def two; end
+end
+
+class UrlForApiTest < ActionController::TestCase
+  tests UrlForApiController
+
+  def setup
+    super
+    @request.host = "www.example.com"
+  end
+
+  def test_url_for
+    get :one
+    assert_equal "http://www.example.com/url_for_api/one", @controller.url_for
+  end
+end
diff --git a/actionpack/test/controller/api/with_cookies_test.rb b/actionpack/test/controller/api/with_cookies_test.rb
new file mode 100644
index 0000000000..1a6e12a4f3
--- /dev/null
+++ b/actionpack/test/controller/api/with_cookies_test.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+class WithCookiesController < ActionController::API
+  include ActionController::Cookies
+
+  def with_cookies
+    render plain: cookies[:foobar]
+  end
+end
+
+class WithCookiesTest < ActionController::TestCase
+  tests WithCookiesController
+
+  def test_with_cookies
+    request.cookies[:foobar] = "bazbang"
+
+    get :with_cookies
+
+    assert_equal "bazbang", response.body
+  end
+end
diff --git a/actionpack/test/controller/api/with_helpers_test.rb b/actionpack/test/controller/api/with_helpers_test.rb
new file mode 100644
index 0000000000..00179d3505
--- /dev/null
+++ b/actionpack/test/controller/api/with_helpers_test.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+
+module ApiWithHelper
+  def my_helper
+    "helper"
+  end
+end
+
+class WithHelpersController < ActionController::API
+  include ActionController::Helpers
+  helper ApiWithHelper
+
+  def with_helpers
+    render plain: self.class.helpers.my_helper
+  end
+end
+
+class SubclassWithHelpersController < WithHelpersController
+  def with_helpers
+    render plain: self.class.helpers.my_helper
+  end
+end
+
+class WithHelpersTest < ActionController::TestCase
+  tests WithHelpersController
+
+  def test_with_helpers
+    get :with_helpers
+
+    assert_equal "helper", response.body
+  end
+end
+
+class SubclassWithHelpersTest < ActionController::TestCase
+  tests WithHelpersController
+
+  def test_with_helpers
+    get :with_helpers
+
+    assert_equal "helper", response.body
+  end
+end