aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-07 19:23:54 +0900
committerGitHub <noreply@github.com>2018-11-07 19:23:54 +0900
commit8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38 (patch)
tree8e8c482a1dc68df48f56a26ce0e5991cbbd0d23d /railties/test
parent133e0ba33db5887b047c9ac8233e5b414657bca5 (diff)
parentb6e4305c3bca4c673996d0af9db0f4cfbf50215e (diff)
downloadrails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.tar.gz
rails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.tar.bz2
rails-8eaffe7e89719ac62ff29c2e4208cfbeb1cd1c38.zip
Merge pull request #34387 from yhirano55/rails_info_properties_json
Respond /rails/info/properties.json
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/rails_info_controller_test.rb5
-rw-r--r--railties/test/rails_info_test.rb12
2 files changed, 17 insertions, 0 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 878a238f8d..6ab68f8333 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -50,6 +50,11 @@ class InfoControllerTest < ActionController::TestCase
assert_select "table"
end
+ test "info controller renders json with properties" do
+ get :properties, format: :json
+ assert_equal Rails::Info.to_json, response.body
+ end
+
test "info controller renders with routes" do
get :routes
assert_response :success
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 50522c1be6..d167a86e56 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -43,6 +43,18 @@ class InfoTest < ActiveSupport::TestCase
end
end
+ def test_json_includes_middleware
+ Rails::Info.module_eval do
+ property "Middleware", ["Rack::Lock", "Rack::Static"]
+ end
+
+ hash = JSON.parse(Rails::Info.to_json)
+ assert_includes hash.keys, "Middleware"
+ properties.value_for("Middleware").each do |value|
+ assert_includes hash["Middleware"], value
+ end
+ end
+
private
def properties
Rails::Info.properties