gds-api-adapters 38.0.0 → 38.1.0

data/test/gov_uk_delivery_test.rb

@@ -3,7 +3,6 @@ require 'gds_api/gov_uk_delivery'
 require 'gds_api/test_helpers/gov_uk_delivery'
 
 describe GdsApi::GovUkDelivery do
-
   include GdsApi::TestHelpers::GovUkDelivery
 
   before do
@@ -28,7 +27,7 @@ describe GdsApi::GovUkDelivery do
   end
 
   it "can post a notification" do
-    expected_payload = { feed_urls: ['http://example.com/feed'], subject: 'Test', body: '<p>Something</p>'}
+    expected_payload = { feed_urls: ['http://example.com/feed'], subject: 'Test', body: '<p>Something</p>' }
     stub = stub_gov_uk_delivery_post_request('notifications', expected_payload).to_return(created_response_hash)
 
     assert @api.notify(['http://example.com/feed'], 'Test', '<p>Something</p>')
@@ -37,15 +36,15 @@ describe GdsApi::GovUkDelivery do
 
   it "can get a subscription URL" do
     expected_payload = { feed_url: 'http://example.com/feed' }
-    stub = stub_gov_uk_delivery_get_request('list-url', expected_payload).to_return(created_response_json_hash({list_url: 'thing'}))
+    stub = stub_gov_uk_delivery_get_request('list-url', expected_payload).to_return(created_response_json_hash(list_url: 'thing'))
 
     assert @api.signup_url('http://example.com/feed')
     assert_requested stub
   end
 
   it "raises if the API 404s" do
-    expected_payload = { feed_url: 'http://example.com/feed'}
-    stub = stub_gov_uk_delivery_get_request('list-url', expected_payload).to_return(not_found_hash)
+    expected_payload = { feed_url: 'http://example.com/feed' }
+    stub_gov_uk_delivery_get_request('list-url', expected_payload).to_return(not_found_hash)
 
     assert_raises(GdsApi::HTTPNotFound) do
       @api.signup_url('http://example.com/feed')
@@ -65,5 +64,4 @@ describe GdsApi::GovUkDelivery do
   def created_response_json_hash(data)
     { body: data.to_json, status: 201 }
   end
-
 end

data/test/imminence_api_test.rb

@@ -2,8 +2,7 @@ require "test_helper"
 require "gds_api/imminence"
 
 class ImminenceApiTest < Minitest::Test
-
-  ROOT = "https://imminence.test.alphagov.co.uk"
+  ROOT = "https://imminence.test.alphagov.co.uk".freeze
   LATITUDE = 52.1327584352089
   LONGITUDE = -0.4702813074674147
 
@@ -87,7 +86,7 @@ class ImminenceApiTest < Minitest::Test
     c = api_client
     url = "#{ROOT}/places/wibble.json?limit=5&lat=52&lng=0"
     place_info = dummy_place.merge(
-      "location" => {"longitude" => LONGITUDE, "latitude" => LATITUDE}
+      "location" => { "longitude" => LONGITUDE, "latitude" => LATITUDE }
     )
     c.expects(:get_json).with(url).returns([place_info])
     places = c.places("wibble", 52, 0)
@@ -139,7 +138,7 @@ EOS
 
     stub_request(:get, "#{ROOT}/places/test.kml").
       with(headers: GdsApi::JsonClient.default_request_headers).
-      to_return(status: 200, body: kml_body )
+      to_return(status: 200, body: kml_body)
 
     response_body = api_client.places_kml("test")
     assert_equal kml_body, response_body
@@ -151,14 +150,14 @@ EOS
       { "id" => 66, "type" => "EUR", "name" => "London", "country_name" => "England" }
     ]
     results = {
-      "_response_info" => {"status" => "ok"},
+      "_response_info" => { "status" => "ok" },
       "total" => areas.size, "startIndex" => 1, "pageSize" => areas.size,
       "currentPage" => 1, "pages" => 1, "results" => areas
     }
 
     stub_request(:get, "#{ROOT}/areas/WC2B%206SE.json").
       with(headers: GdsApi::JsonClient.default_request_headers).
-      to_return(status: 200, body: results.to_json )
+      to_return(status: 200, body: results.to_json)
 
     response = api_client.areas_for_postcode("WC2B 6SE")
 
@@ -175,14 +174,14 @@ EOS
       { "id" => 665, "type" => "EUR", "name" => "London", "country_name" => "England" }
     ]
     results = {
-      "_response_info" => {"status" => "ok"},
+      "_response_info" => { "status" => "ok" },
       "total" => areas.size, "startIndex" => 1, "pageSize" => areas.size,
       "currentPage" => 1, "pages" => 1, "results" => areas
     }
 
     stub_request(:get, "#{ROOT}/areas/EUR.json").
       with(headers: GdsApi::JsonClient.default_request_headers).
-      to_return(status: 200, body: results.to_json )
+      to_return(status: 200, body: results.to_json)
 
     response = api_client.areas_for_type("EUR")
 
@@ -194,5 +193,4 @@ EOS
     assert_equal 122, areas_from_response.first["id"]
     assert_equal 665, areas_from_response.last["id"]
   end
-
 end

data/test/json_client_test.rb

@@ -45,6 +45,13 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
+  def test_request_an_invalid_url
+    url = "http://www.example.com/there-is-a-space-in-this-slug /"
+    assert_raises GdsApi::InvalidUrl do
+      @client.get_json(url)
+    end
+  end
+
   def test_get_should_raise_endpoint_not_found_if_connection_refused
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_raise(Errno::ECONNREFUSED)
@@ -85,7 +92,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_cache_multiple_requests_to_same_url_across_instances
     url = "http://some.endpoint/some.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(body: JSON.dump(result), status: 200)
     response_a = GdsApi::JsonClient.new.get_json(url)
     response_b = GdsApi::JsonClient.new.get_json(url)
@@ -99,12 +106,12 @@ class JsonClientTest < MiniTest::Spec
     GdsApi::JsonClient.cache = nil
 
     url = "http://some.endpoint/"
-    result = {"foo" => "bar"}
+
     stub_request(:get, %r{\A#{url}}).to_return do |request|
       { body: { "url" => request.uri }.to_json, status: 200 }
     end
 
-    response_a = GdsApi::JsonClient.new(:cache_size => 5).get_json("#{url}/first.json")
+    response_a = GdsApi::JsonClient.new(cache_size: 5).get_json("#{url}/first.json")
     response_b = GdsApi::JsonClient.new.get_json("#{url}/second.json")
     4.times { |n| GdsApi::JsonClient.new.get_json("#{url}/#{n}.json") }
 
@@ -119,7 +126,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_cache_requests_for_15_mins_by_default
     url = "http://some.endpoint/some.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(body: JSON.dump(result), status: 200)
     response_a = GdsApi::JsonClient.new.get_json(url)
     response_b = GdsApi::JsonClient.new.get_json(url)
@@ -127,14 +134,14 @@ class JsonClientTest < MiniTest::Spec
     assert_requested :get, url, times: 1
     assert_equal response_a.to_hash, response_b.to_hash
 
-    Timecop.travel( 15 * 60 - 30) do # now + 14 mins 30 secs
+    Timecop.travel(15 * 60 - 30) do # now + 14 mins 30 secs
       response_c = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 1
       assert_equal response_a.to_hash, response_c.to_hash
     end
 
-    Timecop.travel( 15 * 60 + 30) do # now + 15 mins 30 secs
+    Timecop.travel(15 * 60 + 30) do # now + 15 mins 30 secs
       response_d = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -148,22 +155,22 @@ class JsonClientTest < MiniTest::Spec
     GdsApi::JsonClient.cache = nil
 
     url = "http://some.endpoint/some.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(body: JSON.dump(result), status: 200)
-    response_a = GdsApi::JsonClient.new(:cache_ttl => 5 * 60).get_json(url)
+    response_a = GdsApi::JsonClient.new(cache_ttl: 5 * 60).get_json(url)
     response_b = GdsApi::JsonClient.new.get_json(url)
 
     assert_requested :get, url, times: 1
     assert_equal response_a.to_hash, response_b.to_hash
 
-    Timecop.travel( 5 * 60 - 30) do # now + 4 mins 30 secs
+    Timecop.travel(5 * 60 - 30) do # now + 4 mins 30 secs
       response_c = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 1
       assert_equal response_a.to_hash, response_c.to_hash
     end
 
-    Timecop.travel( 5 * 60 + 30) do # now + 5 mins 30 secs
+    Timecop.travel(5 * 60 + 30) do # now + 5 mins 30 secs
       response_d = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -173,7 +180,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_allow_disabling_caching
     url = "http://some.endpoint/some.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(body: JSON.dump(result), status: 200)
 
     client = GdsApi::JsonClient.new(disable_cache: true)
@@ -190,7 +197,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_respect_expiry_headers
     url = "http://some.endpoint/some.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -199,14 +206,14 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 1
       assert_equal response_a.to_hash, response_b.to_hash
     end
 
-    Timecop.travel( 7 * 60 + 30) do # now + 7 mins 30 secs
+    Timecop.travel(7 * 60 + 30) do # now + 7 mins 30 secs
       response_c = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -216,7 +223,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_respect_cache_control_headers_with_max_age
     url = "http://some.endpoint/max_age.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -225,14 +232,14 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 1
       assert_equal response_a.to_hash, response_b.to_hash
     end
 
-    Timecop.travel( 7 * 60 + 30) do # now + 7 mins 30 secs
+    Timecop.travel(7 * 60 + 30) do # now + 7 mins 30 secs
       response_c = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -242,7 +249,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_respect_cache_control_headers_with_no_cache
     url = "http://some.endpoint/no_cache.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -251,7 +258,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -261,7 +268,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_does_not_cache_responses_with_cache_control_private
     url = "http://some.endpoint/private.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -270,7 +277,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -280,7 +287,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_does_not_cache_responses_with_cache_control_no_store
     url = "http://some.endpoint/private.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -289,7 +296,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -299,7 +306,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_respect_cache_control_headers_with_no_cache_and_max_age
     url = "http://some.endpoint/no_cache_and_max_age.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -308,7 +315,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -318,7 +325,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_use_cache_control_headers_over_expires_headers
     url = "http://some.endpoint/url.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -330,7 +337,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 2
@@ -340,7 +347,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_fallback_to_expires_headers_if_cache_control_is_malformed
     url = "http://some.endpoint/url.json"
-    result = {"foo" => "bar"}
+    result = { "foo" => "bar" }
     stub_request(:get, url).to_return(
       body: JSON.dump(result),
       status: 200,
@@ -352,7 +359,7 @@ class JsonClientTest < MiniTest::Spec
 
     response_a = GdsApi::JsonClient.new.get_json(url)
 
-    Timecop.travel( 7 * 60 - 30) do # now + 6 mins 30 secs
+    Timecop.travel(7 * 60 - 30) do # now + 6 mins 30 secs
       response_b = GdsApi::JsonClient.new.get_json(url)
 
       assert_requested :get, url, times: 1
@@ -364,7 +371,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "{}", status: 404)
     assert_raises GdsApi::HTTPNotFound do
-      @client.get_json!(url)
+      @client.get_json(url)
     end
   end
 
@@ -372,7 +379,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_raises GdsApi::HTTPGone do
-      @client.get_json!(url)
+      @client.get_json(url)
     end
   end
 
@@ -380,7 +387,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "{}", status: 403)
     assert_raises GdsApi::HTTPForbidden do
-      @client.get_json!(url)
+      @client.get_json(url)
     end
   end
 
@@ -428,7 +435,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:delete, url).to_return(body: "{}", status: 409)
     assert_raises GdsApi::HTTPConflict do
-      @client.delete_json!(url)
+      @client.delete_json(url)
     end
   end
 
@@ -496,7 +503,7 @@ class JsonClientTest < MiniTest::Spec
     # with a redirect to the same URL, but we'd risk getting the test code into
     # an infinite loop if the code didn't do what it was supposed to. The
     # failure response block aborts the test if we have too many requests.
-    failure = lambda { |request| flunk("Request called too many times") }
+    failure = lambda { |_request| flunk("Request called too many times") }
     stub_request(:get, url).to_return(redirect).times(11).then.to_return(failure)
 
     assert_raises GdsApi::HTTPErrorResponse do
@@ -520,7 +527,7 @@ class JsonClientTest < MiniTest::Spec
     }
 
     # See the comment in the above test for an explanation of this
-    failure = lambda { |request| flunk("Request called too many times") }
+    failure = lambda { |_request| flunk("Request called too many times") }
     stub_request(:get, first_url).to_return(first_redirect).times(6).then.to_return(failure)
     stub_request(:get, second_url).to_return(second_redirect).times(6).then.to_return(failure)
 
@@ -582,7 +589,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_put_json_does_put_with_json_encoded_packet
     url = "http://some.endpoint/some.json"
-    payload = {a: 1}
+    payload = { a: 1 }
     stub_request(:put, url).with(body: payload.to_json).to_return(body: "{}", status: 200)
     assert_equal({}, @client.put_json(url, payload).to_hash)
   end
@@ -597,7 +604,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "Hello there!")
 
-    response = @client.get_json(url) { |http_response| http_response.body }
+    response = @client.get_json(url, &:body)
     assert response.is_a? String
     assert_equal "Hello there!", response
   end
@@ -615,7 +622,7 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:get, url).to_return(body: "Hello there!")
 
-    response = @client.get_json!(url) { |http_response| http_response.body }
+    response = @client.get_json(url, &:body)
     assert response.is_a? String
     assert_equal "Hello there!", response
   end
@@ -637,7 +644,7 @@ class JsonClientTest < MiniTest::Spec
   end
 
   def test_client_can_use_basic_auth
-    client = GdsApi::JsonClient.new(basic_auth: {user: 'user', password: 'password'})
+    client = GdsApi::JsonClient.new(basic_auth: { user: 'user', password: 'password' })
 
     stub_request(:put, "http://user:password@some.endpoint/some.json").
       to_return(body: '{"a":1}', status: 200)
@@ -662,11 +669,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_set_custom_headers_on_gets
     stub_request(:get, "http://some.other.endpoint/some.json").to_return(status: 200)
 
-    response = GdsApi::JsonClient.new.get_json("http://some.other.endpoint/some.json",
-                                               { "HEADER-A" => "B", "HEADER-C" => "D" })
+    GdsApi::JsonClient.new.get_json("http://some.other.endpoint/some.json",
+                                               "HEADER-A" => "B", "HEADER-C" => "D")
 
     assert_requested(:get, %r{/some.json}) do |request|
-      headers_with_uppercase_names = Hash[request.headers.collect {|key, value| [key.upcase, value] }]
+      headers_with_uppercase_names = Hash[request.headers.collect { |key, value| [key.upcase, value] }]
       headers_with_uppercase_names["HEADER-A"] == "B" && headers_with_uppercase_names["HEADER-C"] == "D"
     end
   end
@@ -674,11 +681,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_set_custom_headers_on_posts
     stub_request(:post, "http://some.other.endpoint/some.json").to_return(status: 200)
 
-    response = GdsApi::JsonClient.new.post_json("http://some.other.endpoint/some.json", {},
-                                                { "HEADER-A" => "B", "HEADER-C" => "D" })
+    GdsApi::JsonClient.new.post_json("http://some.other.endpoint/some.json", {},
+                                                "HEADER-A" => "B", "HEADER-C" => "D")
 
     assert_requested(:post, %r{/some.json}) do |request|
-      headers_with_uppercase_names = Hash[request.headers.collect {|key, value| [key.upcase, value] }]
+      headers_with_uppercase_names = Hash[request.headers.collect { |key, value| [key.upcase, value] }]
       headers_with_uppercase_names["HEADER-A"] == "B" && headers_with_uppercase_names["HEADER-C"] == "D"
     end
   end
@@ -686,11 +693,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_set_custom_headers_on_puts
     stub_request(:put, "http://some.other.endpoint/some.json").to_return(status: 200)
 
-    response = GdsApi::JsonClient.new.put_json("http://some.other.endpoint/some.json", {},
-                                               { "HEADER-A" => "B", "HEADER-C" => "D" })
+    GdsApi::JsonClient.new.put_json("http://some.other.endpoint/some.json", {},
+                                               "HEADER-A" => "B", "HEADER-C" => "D")
 
     assert_requested(:put, %r{/some.json}) do |request|
-      headers_with_uppercase_names = Hash[request.headers.collect {|key, value| [key.upcase, value] }]
+      headers_with_uppercase_names = Hash[request.headers.collect { |key, value| [key.upcase, value] }]
       headers_with_uppercase_names["HEADER-A"] == "B" && headers_with_uppercase_names["HEADER-C"] == "D"
     end
   end
@@ -698,11 +705,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_set_custom_headers_on_deletes
     stub_request(:delete, "http://some.other.endpoint/some.json").to_return(status: 200)
 
-    response = GdsApi::JsonClient.new.delete_json("http://some.other.endpoint/some.json",
-                                                  { "HEADER-A" => "B", "HEADER-C" => "D" })
+    GdsApi::JsonClient.new.delete_json("http://some.other.endpoint/some.json",
+                                                  "HEADER-A" => "B", "HEADER-C" => "D")
 
     assert_requested(:delete, %r{/some.json}) do |request|
-      headers_with_uppercase_names = Hash[request.headers.collect {|key, value| [key.upcase, value] }]
+      headers_with_uppercase_names = Hash[request.headers.collect { |key, value| [key.upcase, value] }]
       headers_with_uppercase_names["HEADER-A"] == "B" && headers_with_uppercase_names["HEADER-C"] == "D"
     end
   end
@@ -718,7 +725,7 @@ class JsonClientTest < MiniTest::Spec
 
     assert_requested(:get, %r{/some.json}) do |request|
       request.headers['Govuk-Request-Id'] == '12345' &&
-      request.headers['Govuk-Original-Url'] == 'http://example.com'
+        request.headers['Govuk-Original-Url'] == 'http://example.com'
     end
   end
 
@@ -764,7 +771,7 @@ class JsonClientTest < MiniTest::Spec
            }).
       to_return(body: '{"b": "1"}', status: 200)
 
-    response = @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
+    response = @client.post_multipart("http://some.endpoint/some.json", "a" => "123")
     assert_equal "1", response["b"]
   end
 
@@ -773,7 +780,7 @@ class JsonClientTest < MiniTest::Spec
     stub_request(:post, url).to_return(body: '', status: 404)
 
     assert_raises GdsApi::HTTPNotFound do
-      @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
+      @client.post_multipart("http://some.endpoint/some.json", "a" => "123")
     end
   end
 
@@ -782,7 +789,7 @@ class JsonClientTest < MiniTest::Spec
     stub_request(:post, url).to_return(body: '', status: 500)
 
     assert_raises GdsApi::HTTPServerError do
-      @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
+      @client.post_multipart("http://some.endpoint/some.json", "a" => "123")
     end
   end
 
@@ -796,7 +803,7 @@ class JsonClientTest < MiniTest::Spec
            }).
       to_return(body: '{"b": "1"}', status: 200)
 
-    response = @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
+    response = @client.put_multipart("http://some.endpoint/some.json", "a" => "123")
     assert_equal "1", response["b"]
   end
 
@@ -805,7 +812,7 @@ class JsonClientTest < MiniTest::Spec
     stub_request(:put, url).to_return(body: '', status: 404)
 
     assert_raises GdsApi::HTTPNotFound do
-      @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
+      @client.put_multipart("http://some.endpoint/some.json", "a" => "123")
     end
   end
 
@@ -814,16 +821,16 @@ class JsonClientTest < MiniTest::Spec
     stub_request(:put, url).to_return(body: '', status: 500)
 
     assert_raises GdsApi::HTTPServerError do
-      @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
+      @client.put_multipart("http://some.endpoint/some.json", "a" => "123")
     end
   end
 
   def test_should_raise_error_if_attempting_to_disable_timeout
     assert_raises RuntimeError do
-      GdsApi::JsonClient.new(:disable_timeout => true)
+      GdsApi::JsonClient.new(disable_timeout: true)
     end
     assert_raises RuntimeError do
-      GdsApi::JsonClient.new(:timeout => -1)
+      GdsApi::JsonClient.new(timeout: -1)
     end
   end
 
@@ -857,16 +864,16 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     stub_request(:any, url)
 
-    @client.get_json!(url)
+    @client.get_json(url)
     assert_requested(:get, url, headers: GdsApi::JsonClient.default_request_headers)
 
-    @client.delete_json!(url)
+    @client.delete_json(url)
     assert_requested(:delete, url, headers: GdsApi::JsonClient.default_request_headers)
 
-    @client.post_json!(url, test: "123")
+    @client.post_json(url, test: "123")
     assert_requested(:post, url, headers: GdsApi::JsonClient.default_request_with_json_body_headers)
 
-    @client.put_json!(url, test: "123")
+    @client.put_json(url, test: "123")
     assert_requested(:put, url, headers: GdsApi::JsonClient.default_request_with_json_body_headers)
   end
 end