From c94bac3cf9a3703224ae184a7bbf6fbb0c21f7ff Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 30 Mar 2017 17:38:11 +0200 Subject: [PATCH] Return 406 instead of 500 for statistics.json Fixes #7406 --- app/controllers/node_info_controller.rb | 5 ++++- spec/controllers/node_info_controller_spec.rb | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/node_info_controller.rb b/app/controllers/node_info_controller.rb index cee50ff8a..aaf9b68d8 100644 --- a/app/controllers/node_info_controller.rb +++ b/app/controllers/node_info_controller.rb @@ -13,6 +13,9 @@ class NodeInfoController < ApplicationController end def statistics - @statistics = NodeInfoPresenter.new("1.0") + respond_to do |format| + format.json { head :not_acceptable } + format.all { @statistics = NodeInfoPresenter.new("1.0") } + end end end diff --git a/spec/controllers/node_info_controller_spec.rb b/spec/controllers/node_info_controller_spec.rb index a9e0a86ec..ec7969581 100644 --- a/spec/controllers/node_info_controller_spec.rb +++ b/spec/controllers/node_info_controller_spec.rb @@ -51,6 +51,11 @@ describe NodeInfoController do end describe "#statistics" do + it "returns a 406 for json format" do + get :statistics, format: "json" + expect(response.code).to eq("406") + end + it "responds to html" do get :statistics, format: "html" expect(response.code).to eq("200")