Merge pull request #1028 from alphagov/return-422

Return 422 when request is unprocessable by Publishing API

app/controllers/manuals_controller.rb

@@ -14,6 +14,8 @@ def update
       end
     rescue ActionController::UnknownFormat
       render json: { status: "error", errors: "Invalid Accept header" }, status: :not_acceptable
+    rescue GdsApi::HTTPUnprocessableEntity => e
+      render json: { status: "error", errors: e }, status: :unprocessable_entity
     rescue ValidationError
       render json: { status: "error", errors: manual.errors.full_messages }, status: :unprocessable_entity
     end

app/controllers/sections_controller.rb

@@ -15,6 +15,8 @@ def update
       end
     rescue ActionController::UnknownFormat
       render json: { status: "error", errors: "Invalid Accept header" }, status: :not_acceptable
+    rescue GdsApi::HTTPUnprocessableEntity => e
+      render json: { status: "error", errors: e }, status: :unprocessable_entity
     rescue ValidationError
       render json: { status: "error", errors: section.errors.full_messages }, status: :unprocessable_entity
     end

spec/requests/manual_sections_spec.rb

@@ -4,6 +4,7 @@
 describe "manual sections resource" do
   include GdsApi::TestHelpers::PublishingApi
   include LinksUpdateHelper
+  include PublishingApiHelper
 
   let(:maximal_section_endpoint) do
     "/hmrc-manuals/#{maximal_manual_slug}/sections/#{maximal_section_slug}"
@@ -65,12 +66,12 @@
     expect(response.status).to eq(503)
   end
 
-  it "handles some other error with the Publishing API" do
+  it "handles the Publishing API returning an unproccessable entity error" do
     publishing_api_validation_error
 
     put_json maximal_section_endpoint, maximal_section
 
-    expect(response.status).to eq(500)
+    expect(response.status).to eq(422)
   end
 
   it "returns the status code from the Publishing API response" do
@@ -103,8 +104,4 @@
   def publishing_api_times_out
     stub_request(:any, /#{GdsApi::TestHelpers::PublishingApi::PUBLISHING_API_V2_ENDPOINT}\/.*/).to_timeout
   end
-
-  def publishing_api_validation_error
-    stub_request(:any, /#{GdsApi::TestHelpers::PublishingApi::PUBLISHING_API_V2_ENDPOINT}\/.*/).to_return(status: 422)
-  end
 end

spec/requests/manuals_spec.rb

@@ -4,6 +4,7 @@
 describe "manuals resource" do
   include GdsApi::TestHelpers::PublishingApi
   include LinksUpdateHelper
+  include PublishingApiHelper
 
   it "confirms update of the manual" do
     stub_any_publishing_api_call
@@ -37,6 +38,14 @@
     expect(response.status).to eq(500)
   end
 
+  it "handles the Publishing API returning an unproccessable entity error" do
+    publishing_api_validation_error
+
+    put_json "/hmrc-manuals/#{maximal_manual_slug}", maximal_manual
+
+    expect(response.status).to eq(422)
+  end
+
   it "returns the status code from the Publishing API response" do
     stub_any_publishing_api_call
     stub_any_publishing_api_put_content.to_return(body: { version: nil }.to_json)

spec/support/publishing_api_helper.rb

@@ -0,0 +1,5 @@
+module PublishingApiHelper
+  def publishing_api_validation_error
+    stub_request(:any, /#{GdsApi::TestHelpers::PublishingApi::PUBLISHING_API_V2_ENDPOINT}\/.*/).to_return(status: 422)
+  end
+end