gds-api-adapters 38.0.0 → 38.1.0

data/test/publishing_api_v2_test.rb

@@ -11,7 +11,8 @@ describe GdsApi::PublishingApiV2 do
       "content_id" => content_id,
       "title" => "Instructions for crawler robots",
       "description" => "robots.txt provides rules for which parts of GOV.UK are permitted to be crawled by different bots.",
-      "format" => "special_route",
+      "schema_name" => "special_route",
+      "document_type" => "special_route",
       "public_updated_at" => "2015-07-30T13:58:11.000Z",
       "publishing_app" => "static",
       "rendering_app" => "static",
@@ -83,9 +84,9 @@ describe GdsApi::PublishingApiV2 do
             body: {
               "error" => {
                 "code" => 422,
-                "message" => Pact.term(generate: "Conflict", matcher:/\S+/),
+                "message" => Pact.term(generate: "Conflict", matcher: /\S+/),
                 "fields" => {
-                  "base_path" => Pact.each_like("is already in use by the 'publisher' app", :min => 1),
+                  "base_path" => Pact.each_like("is already in use by the 'publisher' app", min: 1),
                 },
               },
             },
@@ -149,7 +150,6 @@ describe GdsApi::PublishingApiV2 do
             "details" => { "body" => [] },
             "previous_version" => "3"
           )
-          @content_item.delete("format")
 
           publishing_api
             .given("the content item #{@content_id} is at version 3")
@@ -182,7 +182,6 @@ describe GdsApi::PublishingApiV2 do
             "details" => { "body" => [] },
             "previous_version" => "2"
           )
-          @content_item.delete("format")
 
           publishing_api
             .given("the content item #{@content_id} is at version 3")
@@ -200,9 +199,9 @@ describe GdsApi::PublishingApiV2 do
               body: {
                 "error" => {
                   "code" => 409,
-                  "message" => Pact.term(generate: "Conflict", matcher:/\S+/),
+                  "message" => Pact.term(generate: "Conflict", matcher: /\S+/),
                   "fields" => {
-                    "previous_version" => Pact.each_like("does not match", :min => 1),
+                    "previous_version" => Pact.each_like("does not match", min: 1),
                   },
                 },
               },
@@ -260,7 +259,7 @@ describe GdsApi::PublishingApiV2 do
       it "responds with 200 and the content item" do
         response = @api_client.get_content(@content_id)
         assert_equal 200, response.code
-        assert_equal @content_item["format"], response["document_type"]
+        assert_equal @content_item["document_type"], response["document_type"]
       end
     end
 
@@ -365,7 +364,7 @@ describe GdsApi::PublishingApiV2 do
             .will_respond_with(
               status: 200,
               body: {
-                "warnings" => Pact.like({"content_item_blocking_publish" => "message"}),
+                "warnings" => Pact.like("content_item_blocking_publish" => "message"),
                 "content_id" => @content_id,
                 "document_type" => Pact.like("special_route"),
                 "schema_name" => Pact.like("special_route"),
@@ -388,7 +387,6 @@ describe GdsApi::PublishingApiV2 do
           assert_equal 200, response.code
           assert_equal hash_including("content_item_blocking_publish"), response["warnings"]
         end
-
       end
 
       describe "when requesting the published version" do
@@ -492,7 +490,7 @@ describe GdsApi::PublishingApiV2 do
             body: {
               "error" => {
                 "code" => 404,
-                "message" => Pact.term(generate: "not found", matcher:/\S+/)
+                "message" => Pact.term(generate: "not found", matcher: /\S+/)
               },
             },
             headers: {
@@ -585,9 +583,9 @@ describe GdsApi::PublishingApiV2 do
             body: {
               "error" => {
                 "code" => 422,
-                "message" => Pact.term(generate: "Unprocessable entity", matcher:/\S+/),
+                "message" => Pact.term(generate: "Unprocessable entity", matcher: /\S+/),
                 "fields" => {
-                  "update_type" => Pact.each_like("is required", :min => 1),
+                  "update_type" => Pact.each_like("is required", min: 1),
                 },
               },
             }
@@ -623,7 +621,7 @@ describe GdsApi::PublishingApiV2 do
             status: 400,
             body: {
               "error" => {
-                "code" => 400, "message" => Pact.term(generate: "Cannot publish an already published content item", matcher:/\S+/),
+                "code" => 400, "message" => Pact.term(generate: "Cannot publish an already published content item", matcher: /\S+/),
               },
             }
           )
@@ -715,9 +713,9 @@ describe GdsApi::PublishingApiV2 do
               body: {
                 "error" => {
                   "code" => 409,
-                  "message" => Pact.term(generate: "Conflict", matcher:/\S+/),
+                  "message" => Pact.term(generate: "Conflict", matcher: /\S+/),
                   "fields" => {
-                    "previous_version" => Pact.each_like("does not match", :min => 1),
+                    "previous_version" => Pact.each_like("does not match", min: 1),
                   },
                 },
               },
@@ -814,7 +812,7 @@ describe GdsApi::PublishingApiV2 do
             body: {
               "error" => {
                 "code" => 422,
-                "message" => Pact.term(generate: "not-a-valid-type is not a valid unpublishing type", matcher:/\S+/),
+                "message" => Pact.term(generate: "not-a-valid-type is not a valid unpublishing type", matcher: /\S+/),
                 "fields" => {},
               },
             }
@@ -906,9 +904,9 @@ describe GdsApi::PublishingApiV2 do
               body: {
                 "error" => {
                   "code" => 409,
-                  "message" => Pact.term(generate: "Conflict", matcher:/\S+/),
+                  "message" => Pact.term(generate: "Conflict", matcher: /\S+/),
                   "fields" => {
-                    "previous_version" => Pact.each_like("does not match", :min => 1),
+                    "previous_version" => Pact.each_like("does not match", min: 1),
                   },
                 },
               },
@@ -1149,9 +1147,9 @@ describe GdsApi::PublishingApiV2 do
               body: {
                 "error" => {
                   "code" => 409,
-                  "message" => Pact.term(generate: "Conflict", matcher:/\S+/),
+                  "message" => Pact.term(generate: "Conflict", matcher: /\S+/),
                   "fields" => {
-                    "previous_version" => Pact.each_like("does not match", :min => 1),
+                    "previous_version" => Pact.each_like("does not match", min: 1),
                   },
                 },
               },
@@ -1200,7 +1198,7 @@ describe GdsApi::PublishingApiV2 do
 
     it "returns the content items of a given document_type" do
       publishing_api
-        .given("there is content with format 'topic'")
+        .given("there is content with document_type 'topic'")
         .upon_receiving("a get linkables request")
         .with(
           method: :get,
@@ -1218,18 +1216,13 @@ describe GdsApi::PublishingApiV2 do
       response = @api_client.get_linkables(document_type: "topic")
       assert_equal 200, response.code
       assert_equal linkables, response.to_a
-
-      # `format` is supported but deprecated for backwards compatibility
-      response = @api_client.get_linkables(format: "topic")
-      assert_equal 200, response.code
-      assert_equal linkables, response.to_a
     end
   end
 
   describe "#get_content_items" do
-    it "returns the content items of a certain format" do
+    it "returns the content items of a certain document_type" do
       publishing_api
-        .given("there is content with format 'topic'")
+        .given("there is content with document_type 'topic'")
         .upon_receiving("a get entries request")
         .with(
           method: :get,
@@ -1267,10 +1260,9 @@ describe GdsApi::PublishingApiV2 do
         ["total", 2],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=title&fields[]=base_path&page=1", "rel"=>"self"}]],
-        ["results", [{"title"=>"Content Item A", "base_path"=>"/a-base-path"}, {"title"=>"Content Item B", "base_path"=>"/another-base-path"}]]
+        ["links", [{ "href" => "http://example.org/v2/content?document_type=topic&fields[]=title&fields[]=base_path&page=1", "rel" => "self" }]],
+        ["results", [{ "title" => "Content Item A", "base_path" => "/a-base-path" }, { "title" => "Content Item B", "base_path" => "/another-base-path" }]]
       ], response.to_a
-
     end
 
     it "returns the content items in english locale by default" do
@@ -1312,8 +1304,8 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&page=1", "rel"=>"self"}]],
-        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"}]]
+        ["links", [{ "href" => "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&page=1", "rel" => "self" }]],
+        ["results", [{ "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "locale" => "en" }]]
       ], response.to_a
     end
 
@@ -1356,8 +1348,8 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1", "rel"=>"self"}]],
-        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"}]]
+        ["links", [{ "href" => "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1", "rel" => "self" }]],
+        ["results", [{ "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "locale" => "fr" }]]
       ], response.to_a
     end
 
@@ -1402,11 +1394,11 @@ describe GdsApi::PublishingApiV2 do
         ["total", 3],
         ["pages", 1], ["current_page", 1],
         ["links",
-         [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=all&page=1", "rel"=>"self"}]],
+         [{ "href" => "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=locale&locale=all&page=1", "rel" => "self" }]],
         ["results",
-         [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"},
-          {"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"},
-          {"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"ar"}]]
+         [{ "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "locale" => "en" },
+          { "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "locale" => "fr" },
+          { "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "locale" => "ar" }]]
       ], response.to_a
     end
 
@@ -1433,7 +1425,7 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { content_id: @content_id, details: {foo: :bar} }
+              { content_id: @content_id, details: { foo: :bar } }
             ]
           }
         )
@@ -1449,8 +1441,8 @@ describe GdsApi::PublishingApiV2 do
         ["total", 1],
         ["pages", 1],
         ["current_page", 1],
-        ["links", [{"href"=>"http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=details&page=1", "rel"=>"self"}]],
-        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "details"=>{"foo"=>"bar"}}]]
+        ["links", [{ "href" => "http://example.org/v2/content?document_type=topic&fields[]=content_id&fields[]=details&page=1", "rel" => "self" }]],
+        ["results", [{ "content_id" => "bed722e6-db68-43e5-9079-063f623335a7", "details" => { "foo" => "bar" } }]]
       ], response.to_a
     end
   end
@@ -1552,7 +1544,7 @@ describe GdsApi::PublishingApiV2 do
             body: {
               "error" => {
                 "code" => 404,
-                "message" => Pact.term(generate: "not found", matcher:/\S+/)
+                "message" => Pact.term(generate: "not found", matcher: /\S+/)
               },
             },
             headers: {
@@ -1581,12 +1573,12 @@ describe GdsApi::PublishingApiV2 do
         @linking_content_item1 = content_item_for_content_id(content_id3,
           "base_path" => "/item-b",
           "links" => {
-            "topic" => [ @linked_content_item['content_id1'] ]
+            "topic" => [@linked_content_item['content_id1']]
         })
         @linking_content_item2 = content_item_for_content_id(content_id2,
           "base_path" => "/item-a",
           "links" => {
-            "topic" => [ @linked_content_item['content_id1'] ],
+            "topic" => [@linked_content_item['content_id1']],
         })
 
         publishing_api
@@ -1618,10 +1610,8 @@ describe GdsApi::PublishingApiV2 do
       it "returns the requested fields of linking items" do
         response = @api_client.get_linked_items(
           @linked_content_item["content_id"],
-          {
-            link_type: "topic",
-            fields: ["content_id", "base_path"],
-          }
+                      link_type: "topic",
+            fields: %w(content_id base_path)
         )
         assert_equal 200, response.code
 

data/test/response_test.rb

@@ -2,10 +2,9 @@ require_relative 'test_helper'
 require 'gds_api/response'
 
 describe GdsApi::Response do
-
   describe "accessing HTTP response details" do
     before :each do
-      @mock_http_response = stub(:body => "A Response body", :code => 200, :headers => {:cache_control => 'public'})
+      @mock_http_response = stub(body: "A Response body", code: 200, headers: { cache_control: 'public' })
       @response = GdsApi::Response.new(@mock_http_response)
     end
 
@@ -18,17 +17,17 @@ describe GdsApi::Response do
     end
 
     it "should pass-on the response headers" do
-      assert_equal({:cache_control => 'public'}, @response.headers)
+      assert_equal({ cache_control: 'public' }, @response.headers)
     end
   end
 
   describe ".expires_at" do
     it "should be calculated from cache-control max-age" do
       Timecop.freeze(Time.parse("15:00")) do
-        cache_control_headers = { :cache_control => 'public, max-age=900' }
+        cache_control_headers = { cache_control: 'public, max-age=900' }
         headers = cache_control_headers.merge(date: Time.now.httpdate)
 
-        mock_http_response = stub(:body => "A Response body", :code => 200, :headers => headers)
+        mock_http_response = stub(body: "A Response body", code: 200, headers: headers)
         response = GdsApi::Response.new(mock_http_response)
 
         assert_equal Time.parse("15:15"), response.expires_at
@@ -37,10 +36,10 @@ describe GdsApi::Response do
 
     it "should be same as the value of Expires header in absence of max-age" do
       Timecop.freeze(Time.parse("15:00")) do
-        cache_headers = { :cache_control => 'public', :expires => (Time.now + 900).httpdate }
+        cache_headers = { cache_control: 'public', expires: (Time.now + 900).httpdate }
         headers = cache_headers.merge(date: Time.now.httpdate)
 
-        mock_http_response = stub(:body => "A Response body", :code => 200, :headers => headers)
+        mock_http_response = stub(body: "A Response body", code: 200, headers: headers)
         response = GdsApi::Response.new(mock_http_response)
 
         assert_equal Time.parse("15:15"), response.expires_at
@@ -48,14 +47,14 @@ describe GdsApi::Response do
     end
 
     it "should be nil in absence of Expires header and max-age" do
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => { :date => Time.now.httpdate })
+      mock_http_response = stub(body: "A Response body", code: 200, headers: { date: Time.now.httpdate })
       response = GdsApi::Response.new(mock_http_response)
 
       assert_nil response.expires_at
     end
 
     it "should be nil in absence of Date header and max-age" do
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => {})
+      mock_http_response = stub(body: "A Response body", code: 200, headers: {})
       response = GdsApi::Response.new(mock_http_response)
 
       assert_nil response.expires_at
@@ -64,9 +63,9 @@ describe GdsApi::Response do
 
   describe ".expires_in" do
     it "should be seconds remaining from expiration time inferred from max-age" do
-      cache_control_headers = { :cache_control => 'public, max-age=900' }
+      cache_control_headers = { cache_control: 'public, max-age=900' }
       headers = cache_control_headers.merge(date: Time.now.httpdate)
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => headers)
+      mock_http_response = stub(body: "A Response body", code: 200, headers: headers)
 
       Timecop.travel(12 * 60) do
         response = GdsApi::Response.new(mock_http_response)
@@ -75,9 +74,9 @@ describe GdsApi::Response do
     end
 
     it "should be seconds remaining from expiration time inferred from Expires header" do
-      cache_headers = { :cache_control => 'public', :expires => (Time.now + 900).httpdate }
+      cache_headers = { cache_control: 'public', expires: (Time.now + 900).httpdate }
       headers = cache_headers.merge(date: Time.now.httpdate)
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => headers)
+      mock_http_response = stub(body: "A Response body", code: 200, headers: headers)
 
       Timecop.travel(12 * 60) do
         response = GdsApi::Response.new(mock_http_response)
@@ -86,15 +85,15 @@ describe GdsApi::Response do
     end
 
     it "should be nil in absence of Expires header and max-age" do
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => { :date => Time.now.httpdate })
+      mock_http_response = stub(body: "A Response body", code: 200, headers: { date: Time.now.httpdate })
       response = GdsApi::Response.new(mock_http_response)
 
       assert_nil response.expires_in
     end
 
     it "should be nil in absence of Date header" do
-      cache_control_headers = { :cache_control => 'public, max-age=900' }
-      mock_http_response = stub(:body => "A Response body", :code => 200, :headers => cache_control_headers)
+      cache_control_headers = { cache_control: 'public, max-age=900' }
+      mock_http_response = stub(body: "A Response body", code: 200, headers: cache_control_headers)
       response = GdsApi::Response.new(mock_http_response)
 
       assert_nil response.expires_in
@@ -103,7 +102,7 @@ describe GdsApi::Response do
 
   describe "processing web_urls" do
     def build_response(body_string, relative_to = "https://www.gov.uk")
-      GdsApi::Response.new(stub(:body => body_string), :web_urls_relative_to => relative_to)
+      GdsApi::Response.new(stub(body: body_string), web_urls_relative_to: relative_to)
     end
 
     it "should map web URLs" do
@@ -149,7 +148,7 @@ describe GdsApi::Response do
     end
 
     it "should handle nil values" do
-      body = {"web_url" => nil}.to_json
+      body = { "web_url" => nil }.to_json
 
       response = build_response(body)
       assert_nil response['web_url']
@@ -210,12 +209,12 @@ describe GdsApi::Response do
             "language" => "en",
         },
         "tags" => [
-          {"slug" => "foo"},
-          {"slug" => "bar"},
-          {"slug" => "baz"},
+          { "slug" => "foo" },
+          { "slug" => "bar" },
+          { "slug" => "baz" },
         ],
       }
-      @response = GdsApi::Response.new(stub(:body => @response_data.to_json))
+      @response = GdsApi::Response.new(stub(body: @response_data.to_json))
     end
 
     describe "behaving like a read-only hash" do

data/test/router_test.rb

@@ -2,7 +2,6 @@ require 'test_helper'
 require 'gds_api/router'
 
 describe GdsApi::Router do
-
   before do
     @base_api_url = "http://router-api.example.com"
     @api = GdsApi::Router.new(@base_api_url)
@@ -12,8 +11,8 @@ describe GdsApi::Router do
     describe "fetching details about a backend" do
       it "should return backend details" do
         req = WebMock.stub_request(:get, "#{@base_api_url}/backends/foo").
-          to_return(:body => {"backend_id" => "foo", "backend_url" => "http://foo.example.com/"}.to_json,
-                    :headers => {"Content-type" => "application/json"})
+          to_return(body: { "backend_id" => "foo", "backend_url" => "http://foo.example.com/" }.to_json,
+                    headers: { "Content-type" => "application/json" })
 
         response = @api.get_backend("foo")
         assert_equal 200, response.code
@@ -24,7 +23,7 @@ describe GdsApi::Router do
 
       it "raises for a non-existend backend" do
         req = WebMock.stub_request(:get, "#{@base_api_url}/backends/foo").
-          to_return(:status => 404)
+          to_return(status: 404)
 
         assert_raises(GdsApi::HTTPNotFound) do
           @api.get_backend("foo")
@@ -35,7 +34,7 @@ describe GdsApi::Router do
 
       it "should URI escape the given ID" do
         req = WebMock.stub_request(:get, "#{@base_api_url}/backends/foo+bar").
-          to_return(:status => 404)
+          to_return(status: 404)
 
         assert_raises(GdsApi::HTTPNotFound) do
           @api.get_backend("foo bar")
@@ -48,9 +47,9 @@ describe GdsApi::Router do
     describe "creating/updating a backend" do
       it "should allow creating/updating a backend" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/backends/foo").
-          with(:body => {"backend" => {"backend_url" => "http://foo.example.com/"}}.to_json).
-          to_return(:status => 201, :body => {"backend_id" => "foo", "backend_url" => "http://foo.example.com/"}.to_json,
-                    :headers => {"Content-type" => "application/json"})
+          with(body: { "backend" => { "backend_url" => "http://foo.example.com/" } }.to_json).
+          to_return(status: 201, body: { "backend_id" => "foo", "backend_url" => "http://foo.example.com/" }.to_json,
+                    headers: { "Content-type" => "application/json" })
 
         response = @api.add_backend("foo", "http://foo.example.com/")
         assert_equal 201, response.code
@@ -60,10 +59,10 @@ describe GdsApi::Router do
       end
 
       it "should raise an error if creating/updating a backend fails" do
-        response_data = {"backend_id" => "foo", "backend_url" => "ftp://foo.example.com/", "errors" => {"backend_url" => "is not an HTTP URL"}}
+        response_data = { "backend_id" => "foo", "backend_url" => "ftp://foo.example.com/", "errors" => { "backend_url" => "is not an HTTP URL" } }
         req = WebMock.stub_request(:put, "#{@base_api_url}/backends/foo").
-          with(:body => {"backend" => {"backend_url" => "http://foo.example.com/"}}.to_json).
-          to_return(:status => 400, :body => response_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "backend" => { "backend_url" => "http://foo.example.com/" } }.to_json).
+          to_return(status: 400, body: response_data.to_json, headers: { "Content-type" => "application/json" })
 
         e = nil
         begin
@@ -81,13 +80,14 @@ describe GdsApi::Router do
 
       it "should URI escape the passed id" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/backends/foo+bar").
-          with(:body => {"backend" => {"backend_url" => "http://foo.example.com/"}}.to_json).
-          to_return(:status => 404, :body => "Not found")
+          with(body: { "backend" => { "backend_url" => "http://foo.example.com/" } }.to_json).
+          to_return(status: 404, body: "Not found")
 
         # We expect a GdsApi::HTTPErrorResponse, but we want to ensure nothing else is raised
         begin
           @api.add_backend("foo bar", "http://foo.example.com/")
         rescue GdsApi::HTTPErrorResponse
+          nil
         end
 
         assert_requested(req)
@@ -97,8 +97,8 @@ describe GdsApi::Router do
     describe "deleting a backend" do
       it "allow deleting a backend" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/backends/foo").
-          to_return(:status => 200, :body => {"backend_id" => "foo", "backend_url" => "http://foo.example.com/"}.to_json,
-                    :headers => {"Content-type" => "application/json"})
+          to_return(status: 200, body: { "backend_id" => "foo", "backend_url" => "http://foo.example.com/" }.to_json,
+                    headers: { "Content-type" => "application/json" })
 
         response = @api.delete_backend("foo")
         assert_equal 200, response.code
@@ -108,9 +108,9 @@ describe GdsApi::Router do
       end
 
       it "should raise an error if deleting the backend fails" do
-        response_data = {"backend_id" => "foo", "backend_url" => "ftp://foo.example.com/", "errors" => {"base" => "Backend has routes - can't delete"}}
+        response_data = { "backend_id" => "foo", "backend_url" => "ftp://foo.example.com/", "errors" => { "base" => "Backend has routes - can't delete" } }
         req = WebMock.stub_request(:delete, "#{@base_api_url}/backends/foo").
-          to_return(:status => 400, :body => response_data.to_json, :headers => {"Content-type" => "application/json"})
+          to_return(status: 400, body: response_data.to_json, headers: { "Content-type" => "application/json" })
 
         e = nil
         begin
@@ -128,12 +128,11 @@ describe GdsApi::Router do
 
       it "should URI escape the passed id" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/backends/foo+bar").
-          to_return(:status => 404, :body => "Not found")
+          to_return(status: 404, body: "Not found")
 
         # We expect a GdsApi::HTTPErrorResponse, but we want to ensure nothing else is raised
-        begin
+        assert_raises GdsApi::HTTPErrorResponse do
           @api.delete_backend("foo bar")
-        rescue GdsApi::HTTPErrorResponse
         end
 
         assert_requested(req)
@@ -144,15 +143,15 @@ describe GdsApi::Router do
   describe "managing routes" do
     before :each do
       @commit_req = WebMock.stub_request(:post, "#{@base_api_url}/routes/commit").
-        to_return(:status => 200, :body => "Routers updated")
+        to_return(status: 200, body: "Routers updated")
     end
 
     describe "fetching a route" do
       it "should return the route details" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo" }
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo"}).
-          to_return(:status => 200, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(query: { "incoming_path" => "/foo" }).
+          to_return(status: 200, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.get_route("/foo")
         assert_equal 200, response.code
@@ -164,8 +163,8 @@ describe GdsApi::Router do
 
       it "should raise if nothing found" do
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo"}).
-          to_return(:status => 404)
+          with(query: { "incoming_path" => "/foo" }).
+          to_return(status: 404)
 
         assert_raises(GdsApi::HTTPNotFound) do
           @api.get_route("/foo")
@@ -179,8 +178,8 @@ describe GdsApi::Router do
         # The WebMock query matcher matches unescaped params.  The call blows up if they're not escaped
 
         req = WebMock.stub_request(:get, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo bar"}).
-          to_return(:status => 404)
+          with(query: { "incoming_path" => "/foo bar" }).
+          to_return(status: 404)
 
         assert_raises(GdsApi::HTTPNotFound) do
           @api.get_route("/foo bar")
@@ -193,10 +192,10 @@ describe GdsApi::Router do
 
     describe "creating/updating a route" do
       it "should allow creating/updating a route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo" }
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 201, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.add_route("/foo", "exact", "foo")
         assert_equal 201, response.code
@@ -208,21 +207,21 @@ describe GdsApi::Router do
 
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          to_return(:status => 201, :body => {}.to_json, :headers => {"Content-type" => "application/json"})
+          to_return(status: 201, body: {}.to_json, headers: { "Content-type" => "application/json" })
 
-        @api.add_route("/foo", "exact", "foo", :commit => true)
+        @api.add_route("/foo", "exact", "foo", commit: true)
 
         assert_requested(req)
         assert_requested(@commit_req)
       end
 
       it "should raise an error if creating/updating the route fails" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
-        response_data = route_data.merge("errors" => {"backend_id" => "does not exist"})
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo" }
+        response_data = route_data.merge("errors" => { "backend_id" => "does not exist" })
 
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 400, :body => response_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 400, body: response_data.to_json, headers: { "Content-type" => "application/json" })
 
         e = nil
         begin
@@ -242,11 +241,11 @@ describe GdsApi::Router do
 
     describe "creating/updating a redirect route" do
       it "should allow creating/updating a redirect route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
-          "redirect_to" => "/bar", "redirect_type" => "permanent", "segments_mode" => nil}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "permanent", "segments_mode" => nil }
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 201, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.add_redirect_route("/foo", "exact", "/bar")
         assert_equal 201, response.code
@@ -257,11 +256,11 @@ describe GdsApi::Router do
       end
 
       it "should allow creating/updating a temporary redirect route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
-          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => nil}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => nil }
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 201, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.add_redirect_route("/foo", "exact", "/bar", "temporary")
         assert_equal 201, response.code
@@ -272,13 +271,13 @@ describe GdsApi::Router do
       end
 
       it "should allow creating/updating a redirect route which preserves segments" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
-          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => "preserve"}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "/bar", "redirect_type" => "temporary", "segments_mode" => "preserve" }
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 201, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
-        response = @api.add_redirect_route("/foo", "exact", "/bar", "temporary", :segments_mode => "preserve")
+        response = @api.add_redirect_route("/foo", "exact", "/bar", "temporary", segments_mode: "preserve")
         assert_equal 201, response.code
         assert_equal "/bar", response['redirect_to']
 
@@ -288,22 +287,22 @@ describe GdsApi::Router do
 
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          to_return(:status => 201, :body =>{}.to_json, :headers => {"Content-type" => "application/json"})
+          to_return(status: 201, body: {}.to_json, headers: { "Content-type" => "application/json" })
 
-        @api.add_redirect_route("/foo", "exact", "/bar", "temporary", :commit => true)
+        @api.add_redirect_route("/foo", "exact", "/bar", "temporary", commit: true)
 
         assert_requested(req)
         assert_requested(@commit_req)
       end
 
       it "should raise an error if creating/updating the redirect route fails" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
-          "redirect_to" => "bar", "redirect_type" => "permanent", "segments_mode" => nil}
-        response_data = route_data.merge("errors" => {"redirect_to" => "is not a valid URL path"})
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "redirect",
+          "redirect_to" => "bar", "redirect_type" => "permanent", "segments_mode" => nil }
+        response_data = route_data.merge("errors" => { "redirect_to" => "is not a valid URL path" })
 
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 400, :body => response_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 400, body: response_data.to_json, headers: { "Content-type" => "application/json" })
 
         e = nil
         begin
@@ -323,10 +322,10 @@ describe GdsApi::Router do
 
     describe "#add_gone_route" do
       it "should allow creating/updating a gone route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "gone"}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "gone" }
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 201, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 201, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.add_gone_route("/foo", "exact")
         assert_equal 201, response.code
@@ -338,21 +337,21 @@ describe GdsApi::Router do
 
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          to_return(:status => 201, :body =>{}.to_json, :headers => {"Content-type" => "application/json"})
+          to_return(status: 201, body: {}.to_json, headers: { "Content-type" => "application/json" })
 
-        @api.add_gone_route("/foo", "exact", :commit => true)
+        @api.add_gone_route("/foo", "exact", commit: true)
 
         assert_requested(req)
         assert_requested(@commit_req)
       end
 
       it "should raise an error if creating/updating the gone route fails" do
-        route_data = {"incoming_path" => "foo", "route_type" => "exact", "handler" => "gone"}
-        response_data = route_data.merge("errors" => {"incoming_path" => "is not a valid URL path"})
+        route_data = { "incoming_path" => "foo", "route_type" => "exact", "handler" => "gone" }
+        response_data = route_data.merge("errors" => { "incoming_path" => "is not a valid URL path" })
 
         req = WebMock.stub_request(:put, "#{@base_api_url}/routes").
-          with(:body => {"route" => route_data}.to_json).
-          to_return(:status => 400, :body => response_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(body: { "route" => route_data }.to_json).
+          to_return(status: 400, body: response_data.to_json, headers: { "Content-type" => "application/json" })
 
         e = nil
         begin
@@ -372,10 +371,10 @@ describe GdsApi::Router do
 
     describe "deleting a route" do
       it "should allow deleting a route" do
-        route_data = {"incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo"}
+        route_data = { "incoming_path" => "/foo", "route_type" => "exact", "handler" => "backend", "backend_id" => "foo" }
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo"}).
-          to_return(:status => 200, :body => route_data.to_json, :headers => {"Content-type" => "application/json"})
+          with(query: { "incoming_path" => "/foo" }).
+          to_return(status: 200, body: route_data.to_json, headers: { "Content-type" => "application/json" })
 
         response = @api.delete_route("/foo")
         assert_equal 200, response.code
@@ -387,10 +386,10 @@ describe GdsApi::Router do
 
       it "should commit the routes when asked to" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo"}).
-          to_return(:status => 200, :body => {}.to_json, :headers => {"Content-type" => "application/json"})
+          with(query: { "incoming_path" => "/foo" }).
+          to_return(status: 200, body: {}.to_json, headers: { "Content-type" => "application/json" })
 
-        @api.delete_route("/foo", :commit => true)
+        @api.delete_route("/foo", commit: true)
 
         assert_requested(req)
         assert_requested(@commit_req)
@@ -398,8 +397,8 @@ describe GdsApi::Router do
 
       it "should raise HTTPNotFound if nothing found" do
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo"}).
-          to_return(:status => 404)
+          with(query: { "incoming_path" => "/foo" }).
+          to_return(status: 404)
 
         e = nil
         begin
@@ -419,12 +418,11 @@ describe GdsApi::Router do
         # The WebMock query matcher matches unescaped params.  The call blows up if they're not escaped
 
         req = WebMock.stub_request(:delete, "#{@base_api_url}/routes").
-          with(:query => {"incoming_path" => "/foo bar"}).
-          to_return(:status => 404)
+          with(query: { "incoming_path" => "/foo bar" }).
+          to_return(status: 404)
 
-        begin
+        assert_raises GdsApi::HTTPNotFound do
           @api.delete_route("/foo bar")
-        rescue GdsApi::HTTPNotFound
         end
 
         assert_requested(req)
@@ -439,8 +437,8 @@ describe GdsApi::Router do
       end
 
       it "should raise an error if committing the routes fails" do
-        req = WebMock.stub_request(:post, "#{@base_api_url}/routes/commit").
-          to_return(:status => 500, :body => "Failed to update all routers")
+        WebMock.stub_request(:post, "#{@base_api_url}/routes/commit").
+          to_return(status: 500, body: "Failed to update all routers")
 
         e = nil
         begin