gds-api-adapters 36.4.1 → 37.0.0

data/test/content_store_test.rb

@@ -20,48 +20,36 @@ describe GdsApi::ContentStore do
       assert_equal base_path, response["base_path"]
     end
 
-    it "returns nil if the item doesn't exist" do
+    it "raises if the item doesn't exist" do
       content_store_does_not_have_item("/non-existent")
 
-      assert_nil @api.content_item("/non-existent")
-    end
-
-    it "raises if the item doesn't exist and `always_raise_for_not_found` enabled" do
-      GdsApi.configure do |config|
-        config.always_raise_for_not_found = true
+      assert_raises(GdsApi::HTTPNotFound) do
+        @api.content_item("/non-existent")
       end
+    end
 
+    it "raises if the item doesn't exist" do
       content_store_does_not_have_item("/non-existent")
 
       assert_raises GdsApi::HTTPNotFound do
         @api.content_item("/non-existent")
       end
-
-      GdsApi.configure do |config|
-        config.always_raise_for_not_found = false
-      end
     end
 
-    it "returns nil if the item is gone" do
+    it "raises if the item is gone" do
       content_store_has_gone_item("/it-is-gone")
 
-      assert_nil @api.content_item("/it-is-gone")
-    end
-
-    it "raises if the item is gone and `always_raise_for_not_found` enabled" do
-      GdsApi.configure do |config|
-        config.always_raise_for_not_found = true
+      assert_raises(GdsApi::HTTPGone) do
+        @api.content_item("/it-is-gone")
       end
+    end
 
+    it "raises if the item is gone" do
       content_store_has_gone_item("/it-is-gone")
 
       assert_raises GdsApi::HTTPGone do
         @api.content_item("/it-is-gone")
       end
-
-      GdsApi.configure do |config|
-        config.always_raise_for_not_found = false
-      end
     end
   end
 

data/test/gov_uk_delivery_test.rb

@@ -36,18 +36,20 @@ describe GdsApi::GovUkDelivery do
   end
 
   it "can get a subscription URL" do
-    expected_payload = { feed_url: 'http://example.com/feed'}
+    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'}))
 
     assert @api.signup_url('http://example.com/feed')
     assert_requested stub
   end
 
-  it "returns nil if the API 404s" do
+  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)
 
-    assert @api.signup_url('http://example.com/feed').nil?
+    assert_raises(GdsApi::HTTPNotFound) do
+      @api.signup_url('http://example.com/feed')
+    end
   end
 
   private

data/test/json_client_test.rb

@@ -28,6 +28,21 @@ class JsonClientTest < MiniTest::Spec
     {}
   end
 
+  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this helper
+  # method no longer makes sense and it should be deleted.
+  def with_hash_response_for_requests_disabled
+    @old_hash_response_for_requests = GdsApi.config.hash_response_for_requests
+    GdsApi.configure do |config|
+      config.hash_response_for_requests = false
+    end
+
+    yield
+
+    GdsApi.configure do |config|
+      config.hash_response_for_requests = @old_hash_response_for_requests
+    end
+  end
+
   def test_long_get_requests_timeout
     url = "http://www.example.com/timeout.json"
     stub_request(:get, url).to_timeout
@@ -79,14 +94,14 @@ class JsonClientTest < MiniTest::Spec
 
   def test_should_fetch_and_parse_json_into_response
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 200)
+    stub_request(:get, url).to_return(body: "{}", status: 200)
     assert_equal GdsApi::Response, @client.get_json(url).class
   end
 
   def test_should_cache_multiple_requests_to_same_url_across_instances
     url = "http://some.endpoint/some.json"
     result = {"foo" => "bar"}
-    stub_request(:get, url).to_return(:body => JSON.dump(result), :status => 200)
+    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)
     assert_equal response_a.to_hash, response_b.to_hash
@@ -101,7 +116,7 @@ class JsonClientTest < MiniTest::Spec
     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}
+      { body: { "url" => request.uri }.to_json, status: 200 }
     end
 
     response_a = GdsApi::JsonClient.new(:cache_size => 5).get_json("#{url}/first.json")
@@ -120,7 +135,7 @@ class JsonClientTest < MiniTest::Spec
   def test_should_cache_requests_for_15_mins_by_default
     url = "http://some.endpoint/some.json"
     result = {"foo" => "bar"}
-    stub_request(:get, url).to_return(:body => JSON.dump(result), :status => 200)#.times(1)
+    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)
 
@@ -149,7 +164,7 @@ class JsonClientTest < MiniTest::Spec
 
     url = "http://some.endpoint/some.json"
     result = {"foo" => "bar"}
-    stub_request(:get, url).to_return(:body => JSON.dump(result), :status => 200)#.times(1)
+    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_b = GdsApi::JsonClient.new.get_json(url)
 
@@ -174,7 +189,7 @@ class JsonClientTest < MiniTest::Spec
   def test_should_allow_disabling_caching
     url = "http://some.endpoint/some.json"
     result = {"foo" => "bar"}
-    stub_request(:get, url).to_return(:body => JSON.dump(result), :status => 200)
+    stub_request(:get, url).to_return(body: JSON.dump(result), status: 200)
 
     client = GdsApi::JsonClient.new(disable_cache: true)
 
@@ -192,9 +207,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Expires" => (Time.now + 7 * 60).utc.httpdate }
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Expires" => (Time.now + 7 * 60).utc.httpdate }
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -218,9 +233,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/max_age.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Cache-Control" => "max-age=420, public" } # 7 minutes
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Cache-Control" => "max-age=420, public" } # 7 minutes
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -244,9 +259,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/no_cache.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Cache-Control" => "no-cache, public" }
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Cache-Control" => "no-cache, public" }
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -263,9 +278,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/private.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Cache-Control" => "max-age=600, private" }
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Cache-Control" => "max-age=600, private" }
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -282,9 +297,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/private.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Cache-Control" => "max-age=600, no-store" }
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Cache-Control" => "max-age=600, no-store" }
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -301,9 +316,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/no_cache_and_max_age.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => { "Cache-Control" => "max-age=600, no-cache, public" }
+      body: JSON.dump(result),
+      status: 200,
+      headers: { "Cache-Control" => "max-age=600, no-cache, public" }
     )
 
     response_a = GdsApi::JsonClient.new.get_json(url)
@@ -320,9 +335,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/url.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => {
+      body: JSON.dump(result),
+      status: 200,
+      headers: {
         "Cache-Control" => "no-cache",
         "Expires" => (Time.now + 7 * 60).utc.httpdate
       }
@@ -342,9 +357,9 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/url.json"
     result = {"foo" => "bar"}
     stub_request(:get, url).to_return(
-      :body => JSON.dump(result),
-      :status => 200,
-      :headers => {
+      body: JSON.dump(result),
+      status: 200,
+      headers: {
         "Cache-Control" => "foo, bar, baz",
         "Expires" => (Time.now + 7 * 60).utc.httpdate
       }
@@ -362,7 +377,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_get_bang_should_raise_http_not_found_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 404)
+    stub_request(:get, url).to_return(body: "{}", status: 404)
     assert_raises GdsApi::HTTPNotFound do
       @client.get_json!(url)
     end
@@ -370,7 +385,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_get_bang_should_raise_http_gone_if_410_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 410)
+    stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_raises GdsApi::HTTPGone do
       @client.get_json!(url)
     end
@@ -378,19 +393,22 @@ class JsonClientTest < MiniTest::Spec
 
   def test_get_bang_should_raise_http_forbidden_if_403_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 403)
+    stub_request(:get, url).to_return(body: "{}", status: 403)
     assert_raises GdsApi::HTTPForbidden do
       @client.get_json!(url)
     end
   end
 
+  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
+  # need to remove it from this test.
   def test_get_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
     @old_always_raise = GdsApi.config.always_raise_for_not_found
     GdsApi.configure do |config|
       config.always_raise_for_not_found = false
     end
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 404)
+    stub_request(:get, url).to_return(body: "{}", status: 404)
+
     assert_nil @client.get_json(url)
   ensure
     GdsApi.configure do |config|
@@ -398,13 +416,15 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
+  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
+  # need to remove it from this test.
   def test_get_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
     @old_always_raise = GdsApi.config.always_raise_for_not_found
     GdsApi.configure do |config|
       config.always_raise_for_not_found = false
     end
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 410)
+    stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_nil @client.get_json(url)
   ensure
     GdsApi.configure do |config|
@@ -412,45 +432,31 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
-  def test_get_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_enabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = true
-    end
+  def test_get_should_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 404)
+    stub_request(:get, url).to_return(body: "{}", status: 404)
     assert_raises GdsApi::HTTPNotFound do
       @client.get_json(url)
     end
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
   end
 
-  def test_get_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_enabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = true
-    end
+  def test_get_should_raise_if_410_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 410)
+    stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_raises GdsApi::HTTPGone do
       @client.get_json(url)
     end
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
   end
 
+  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
+  # need to remove it from this test.
   def test_get_raw_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
     @old_always_raise = GdsApi.config.always_raise_for_not_found
     GdsApi.configure do |config|
       config.always_raise_for_not_found = false
     end
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 404)
+    stub_request(:get, url).to_return(body: "{}", status: 404)
     assert_nil @client.get_raw(url)
   ensure
     GdsApi.configure do |config|
@@ -458,13 +464,15 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
+  # TODO: always_raise_for_not_found will be gone by December 1st, 2016. We will
+  # need to remove it from this test.
   def test_get_raw_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_disabled
     @old_always_raise = GdsApi.config.always_raise_for_not_found
     GdsApi.configure do |config|
       config.always_raise_for_not_found = false
     end
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 410)
+    stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_nil @client.get_raw(url)
   ensure
     GdsApi.configure do |config|
@@ -472,41 +480,25 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
-  def test_get_raw_should_be_nil_if_404_returned_from_endpoint_and_always_raise_for_not_found_is_enabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = true
-    end
+  def test_get_raw_should_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 404)
+    stub_request(:get, url).to_return(body: "{}", status: 404)
     assert_raises GdsApi::HTTPNotFound do
       @client.get_raw(url)
     end
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
   end
 
-  def test_get_raw_should_be_nil_if_410_returned_from_endpoint_and_always_raise_for_not_found_is_enabled
-    @old_always_raise = GdsApi.config.always_raise_for_not_found
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = true
-    end
+  def test_get_raw_should_be_nil_if_410_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 410)
+    stub_request(:get, url).to_return(body: "{}", status: 410)
     assert_raises GdsApi::HTTPGone do
       @client.get_raw(url)
     end
-  ensure
-    GdsApi.configure do |config|
-      config.always_raise_for_not_found = @old_always_raise
-    end
   end
 
   def test_get_should_raise_error_if_non_404_non_410_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "{}", :status => 500)
+    stub_request(:get, url).to_return(body: "{}", status: 500)
     assert_raises GdsApi::HTTPServerError do
       @client.get_json(url)
     end
@@ -514,7 +506,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_get_should_raise_conflict_for_409
     url = "http://some.endpoint/some.json"
-    stub_request(:delete, url).to_return(:body => "{}", :status => 409)
+    stub_request(:delete, url).to_return(body: "{}", status: 409)
     assert_raises GdsApi::HTTPConflict do
       @client.delete_json!(url)
     end
@@ -524,60 +516,60 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     new_url = "http://some.endpoint/other.json"
     stub_request(:get, url).to_return(
-      :body => "",
-      :status => 301,
-      :headers => {"Location" => new_url}
+      body: "",
+      status: 301,
+      headers: { "Location" => new_url }
     )
-    stub_request(:get, new_url).to_return(:body => '{"a": 1}', :status => 200)
+    stub_request(:get, new_url).to_return(body: '{"a": 1}', status: 200)
     result = @client.get_json(url)
-    assert_equal 1, result.a
+    assert_equal 1, result['a']
   end
 
   def test_get_should_follow_found_redirect
     url = "http://some.endpoint/some.json"
     new_url = "http://some.endpoint/other.json"
     stub_request(:get, url).to_return(
-      :body => "",
-      :status => 302,
-      :headers => {"Location" => new_url}
+      body: "",
+      status: 302,
+      headers: { "Location" => new_url }
     )
-    stub_request(:get, new_url).to_return(:body => '{"a": 1}', :status => 200)
+    stub_request(:get, new_url).to_return(body: '{"a": 1}', status: 200)
     result = @client.get_json(url)
-    assert_equal 1, result.a
+    assert_equal 1, result['a']
   end
 
   def test_get_should_follow_see_other
     url = "http://some.endpoint/some.json"
     new_url = "http://some.endpoint/other.json"
     stub_request(:get, url).to_return(
-      :body => "",
-      :status => 303,
-      :headers => {"Location" => new_url}
+      body: "",
+      status: 303,
+      headers: { "Location" => new_url }
     )
-    stub_request(:get, new_url).to_return(:body => '{"a": 1}', :status => 200)
+    stub_request(:get, new_url).to_return(body: '{"a": 1}', status: 200)
     result = @client.get_json(url)
-    assert_equal 1, result.a
+    assert_equal 1, result['a']
   end
 
   def test_get_should_follow_temporary_redirect
     url = "http://some.endpoint/some.json"
     new_url = "http://some.endpoint/other.json"
     stub_request(:get, url).to_return(
-      :body => "",
-      :status => 307,
-      :headers => {"Location" => new_url}
+      body: "",
+      status: 307,
+      headers: { "Location" => new_url }
     )
-    stub_request(:get, new_url).to_return(:body => '{"a": 1}', :status => 200)
+    stub_request(:get, new_url).to_return(body: '{"a": 1}', status: 200)
     result = @client.get_json(url)
-    assert_equal 1, result.a
+    assert_equal 1, result['a']
   end
 
   def test_should_handle_infinite_redirects
     url = "http://some.endpoint/some.json"
     redirect = {
-      :body => "",
-      :status => 302,
-      :headers => {"Location" => url}
+      body: "",
+      status: 302,
+      headers: { "Location" => url }
     }
 
     # Theoretically, we could set this up to mock out any number of requests
@@ -597,14 +589,14 @@ class JsonClientTest < MiniTest::Spec
     second_url = "http://some.endpoint/some-other.json"
 
     first_redirect = {
-      :body => "",
-      :status => 302,
-      :headers => {"Location" => second_url}
+      body: "",
+      status: 302,
+      headers: { "Location" => second_url }
     }
     second_redirect = {
-      :body => "",
-      :status => 302,
-      :headers => {"Location" => first_url}
+      body: "",
+      status: 302,
+      headers: { "Location" => first_url }
     }
 
     # See the comment in the above test for an explanation of this
@@ -617,15 +609,17 @@ class JsonClientTest < MiniTest::Spec
     end
   end
 
-  def test_post_should_be_nil_if_404_returned_from_endpoint
+  def test_post_should_be_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:post, url).to_return(:body => "{}", :status => 404)
-    assert_nil @client.post_json(url, {})
+    stub_request(:post, url).to_return(body: "{}", status: 404)
+    assert_raises(GdsApi::HTTPNotFound) do
+      @client.post_json(url, {})
+    end
   end
 
   def test_post_should_raise_error_if_non_404_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:post, url).to_return(:body => "{}", :status => 500)
+    stub_request(:post, url).to_return(body: "{}", status: 500)
     assert_raises GdsApi::HTTPServerError do
       @client.post_json(url, {})
     end
@@ -635,95 +629,104 @@ class JsonClientTest < MiniTest::Spec
     url = "http://some.endpoint/some.json"
     new_url = "http://some.endpoint/other.json"
     stub_request(:post, url).to_return(
-      :body => "",
-      :status => 302,
-      :headers => {"Location" => new_url}
+      body: "",
+      status: 302,
+      headers: { "Location" => new_url }
     )
     assert_raises GdsApi::HTTPErrorResponse do
       @client.post_json(url, {})
     end
   end
 
-  def test_put_should_be_nil_if_404_returned_from_endpoint
+  def test_put_should_be_raise_if_404_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => "{}", :status => 404)
-    assert_nil @client.put_json(url, {})
+    stub_request(:put, url).to_return(body: "{}", status: 404)
+
+    assert_raises(GdsApi::HTTPNotFound) do
+      @client.put_json(url, {})
+    end
   end
 
   def test_put_should_raise_error_if_non_404_error_code_returned_from_endpoint
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => "{}", :status => 500)
+    stub_request(:put, url).to_return(body: "{}", status: 500)
     assert_raises GdsApi::HTTPServerError do
       @client.put_json(url, {})
     end
   end
 
   def empty_response
-    net_http_response = stub(:body => '{}')
+    net_http_response = stub(body: '{}')
     GdsApi::Response.new(net_http_response)
   end
 
   def test_put_json_does_put_with_json_encoded_packet
     url = "http://some.endpoint/some.json"
     payload = {a: 1}
-    stub_request(:put, url).with(body: payload.to_json).to_return(:body => "{}", :status => 200)
+    stub_request(:put, url).with(body: payload.to_json).to_return(body: "{}", status: 200)
     assert_equal({}, @client.put_json(url, payload).to_hash)
   end
 
   def test_does_not_encode_json_if_payload_is_nil
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).with(body: nil).to_return(:body => "{}", :status => 200)
+    stub_request(:put, url).with(body: nil).to_return(body: "{}", status: 200)
     assert_equal({}, @client.put_json(url, nil).to_hash)
   end
 
   def test_can_build_custom_response_object
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "Hello there!")
+    stub_request(:get, url).to_return(body: "Hello there!")
 
     response = @client.get_json(url) { |http_response| http_response.body }
     assert response.is_a? String
     assert_equal "Hello there!", response
   end
 
-  def test_responds_with_nil_on_custom_response_404
+  def test_raises_on_custom_response_404
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "", :status => 404)
+    stub_request(:get, url).to_return(body: "", status: 404)
 
-    response = @client.get_json(url) { |http_response| http_response.body }
-    assert_nil response
+    assert_raises(GdsApi::HTTPNotFound) do
+      @client.get_json(url, &:body)
+    end
   end
 
   def test_can_build_custom_response_object_in_bang_method
     url = "http://some.endpoint/some.json"
-    stub_request(:get, url).to_return(:body => "Hello there!")
+    stub_request(:get, url).to_return(body: "Hello there!")
 
     response = @client.get_json!(url) { |http_response| http_response.body }
     assert response.is_a? String
     assert_equal "Hello there!", response
   end
 
+  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
+  # no longer makes sense and it should be deleted.
   def test_can_convert_response_to_ostruct
-    url = "http://some.endpoint/some.json"
-    payload = {a: 1}
-    stub_request(:put, url).with(body: payload.to_json).to_return(:body => '{"a":1}', :status => 200)
-    response = @client.put_json(url, payload)
-    assert_equal(OpenStruct.new(a: 1), response.to_ostruct)
+    with_hash_response_for_requests_disabled do
+      url = "http://some.endpoint/some.json"
+      payload = { a: 1 }
+      stub_request(:put, url).with(body: payload.to_json).to_return(body: '{"a":1}', status: 200)
+      response = @client.put_json(url, payload)
+      assert_equal(OpenStruct.new(a: 1), response.to_ostruct)
+    end
   end
 
   def test_can_access_attributes_of_response_directly
     url = "http://some.endpoint/some.json"
-    payload = {a: 1}
-    stub_request(:put, url).with(body: payload.to_json).to_return(:body => '{"a":{"b":2}}', :status => 200)
+    payload = { a: 1 }
+    stub_request(:put, url).with(body: payload.to_json).to_return(body: '{"a":{"b":2}}', status: 200)
     response = @client.put_json(url, payload)
-    assert_equal 2, response.a.b
+    assert_equal 2, response['a']['b']
   end
 
   def test_cant_access_attributes_of_response_directly_if_hash_only
     url = "http://some.endpoint/some.json"
-    payload = {a: 1}
-    stub_request(:put, url).with(body: payload.to_json).to_return(:body => '{"a":{"b":2}}', :status => 200)
+    payload = { a: 1 }
+    stub_request(:put, url).with(body: payload.to_json).to_return(body: '{"a":{"b":2}}', status: 200)
     response = @client.put_json(url, payload)
 
+    @old_hash_response_for_requests = GdsApi.config.hash_response_for_requests
     GdsApi.configure do |config|
       config.hash_response_for_requests = true
     end
@@ -733,28 +736,36 @@ class JsonClientTest < MiniTest::Spec
     end
 
     GdsApi.configure do |config|
-      config.hash_response_for_requests = false
+      config.hash_response_for_requests = @old_hash_response_for_requests
     end
   end
 
+  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
+  # no longer makes sense and it should be deleted.
   def test_accessing_non_existent_attribute_of_response_returns_nil
-    url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => '{"a":1}', :status => 200)
-    response = @client.put_json(url, {})
-    assert_equal nil, response.does_not_exist
+    with_hash_response_for_requests_disabled do
+      url = "http://some.endpoint/some.json"
+      stub_request(:put, url).to_return(body: '{"a":1}', status: 200)
+      response = @client.put_json(url, {})
+      assert_equal nil, response.does_not_exist
+    end
   end
 
+  # TODO: When we remove `GdsApi.config.hash_response_for_requests`, this test
+  # no longer makes sense and it should be deleted.
   def test_response_does_not_claim_to_respond_to_methods_corresponding_to_non_existent_attributes
-    # This mimics the behaviour of OpenStruct
-    url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => '{"a":1}', :status => 200)
-    response = @client.put_json(url, {})
-    assert ! response.respond_to?(:does_not_exist)
+    with_hash_response_for_requests_disabled do
+      # This mimics the behaviour of OpenStruct
+      url = "http://some.endpoint/some.json"
+      stub_request(:put, url).to_return(body: '{"a":1}', status: 200)
+      response = @client.put_json(url, {})
+      assert ! response.respond_to?(:does_not_exist)
+    end
   end
 
   def test_a_response_is_always_considered_present_and_not_blank
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => '{"a":1}', :status => 200)
+    stub_request(:put, url).to_return(body: '{"a":1}', status: 200)
     response = @client.put_json(url, {})
     assert ! response.blank?
     assert response.present?
@@ -764,10 +775,10 @@ class JsonClientTest < MiniTest::Spec
     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)
+      to_return(body: '{"a":1}', status: 200)
 
     response = client.put_json("http://some.endpoint/some.json", {})
-    assert_equal 1, response.a
+    assert_equal 1, response['a']
   end
 
   def test_client_can_use_bearer_token
@@ -776,15 +787,15 @@ class JsonClientTest < MiniTest::Spec
       merge('Authorization' => 'Bearer SOME_BEARER_TOKEN')
 
     stub_request(:put, "http://some.other.endpoint/some.json").
-      with(:headers => expected_headers).
-      to_return(:body => '{"a":2}', :status => 200)
+      with(headers: expected_headers).
+      to_return(body: '{"a":2}', status: 200)
 
     response = client.put_json("http://some.other.endpoint/some.json", {})
-    assert_equal 2, response.a
+    assert_equal 2, response['a']
   end
 
   def test_client_can_set_custom_headers_on_gets
-    stub_request(:get, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    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" })
@@ -796,7 +807,7 @@ class JsonClientTest < MiniTest::Spec
   end
 
   def test_client_can_set_custom_headers_on_posts
-    stub_request(:post, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    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" })
@@ -808,7 +819,7 @@ class JsonClientTest < MiniTest::Spec
   end
 
   def test_client_can_set_custom_headers_on_puts
-    stub_request(:put, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    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" })
@@ -820,7 +831,7 @@ class JsonClientTest < MiniTest::Spec
   end
 
   def test_client_can_set_custom_headers_on_deletes
-    stub_request(:delete, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    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" })
@@ -836,7 +847,7 @@ class JsonClientTest < MiniTest::Spec
     GdsApi::GovukHeaders.set_header(:govuk_request_id, "12345")
     GdsApi::GovukHeaders.set_header(:govuk_original_url, "http://example.com")
 
-    stub_request(:get, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    stub_request(:get, "http://some.other.endpoint/some.json").to_return(status: 200)
 
     GdsApi::JsonClient.new.get_json("http://some.other.endpoint/some.json")
 
@@ -848,7 +859,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_govuk_headers_ignored_in_requests_if_not_present
     GdsApi::GovukHeaders.set_header(:x_govuk_authenticated_user, "")
-    stub_request(:get, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    stub_request(:get, "http://some.other.endpoint/some.json").to_return(status: 200)
 
     GdsApi::JsonClient.new.get_json("http://some.other.endpoint/some.json")
 
@@ -858,7 +869,7 @@ class JsonClientTest < MiniTest::Spec
   end
 
   def test_additional_headers_passed_in_do_not_get_modified
-    stub_request(:get, "http://some.other.endpoint/some.json").to_return(:status => 200)
+    stub_request(:get, "http://some.other.endpoint/some.json").to_return(status: 200)
 
     headers = { 'HEADER-A' => 'A' }
     GdsApi::JsonClient.new.get_json("http://some.other.endpoint/some.json", headers)
@@ -869,7 +880,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_decompress_gzip_responses
     url = "http://some.endpoint/some.json"
     # {"test": "hello"}
-    stub_request(:get, url).to_return(:body => "\u001F\x8B\b\u0000Q\u000F\u0019Q\u0000\u0003\xABVP*I-.Q\xB2RP\xCAH\xCD\xC9\xC9WR\xA8\u0005\u0000\xD1C\u0018\xFE\u0013\u0000\u0000\u0000", :status => 200, :headers => { 'Content-Encoding' => 'gzip' })
+    stub_request(:get, url).to_return(
+      body: "\u001F\x8B\b\u0000Q\u000F\u0019Q\u0000\u0003\xABVP*I-.Q\xB2RP\xCAH\xCD\xC9\xC9WR\xA8\u0005\u0000\xD1C\u0018\xFE\u0013\u0000\u0000\u0000",
+      status: 200,
+      headers: { 'Content-Encoding' => 'gzip' }
+    )
     response = @client.get_json(url)
 
     assert_equal "hello", response["test"]
@@ -878,11 +893,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_post_multipart_responses
     url = "http://some.endpoint/some.json"
     stub_request(:post, url).
-      with(:body => %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
-           :headers => {
+      with(body: %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
+           headers: {
              'Content-Type' => %r{multipart/form-data; boundary=----RubyFormBoundary\w+}
            }).
-      to_return(:body => '{"b": "1"}', :status => 200)
+      to_return(body: '{"b": "1"}', status: 200)
 
     response = @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
     assert_equal "1", response["b"]
@@ -890,7 +905,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_post_multipart_should_raise_exception_if_not_found
     url = "http://some.endpoint/some.json"
-    stub_request(:post, url).to_return(:body => '', :status => 404)
+    stub_request(:post, url).to_return(body: '', status: 404)
 
     assert_raises GdsApi::HTTPNotFound do
       @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
@@ -899,7 +914,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_post_multipart_should_raise_error_responses
     url = "http://some.endpoint/some.json"
-    stub_request(:post, url).to_return(:body => '', :status => 500)
+    stub_request(:post, url).to_return(body: '', status: 500)
 
     assert_raises GdsApi::HTTPServerError do
       @client.post_multipart("http://some.endpoint/some.json", {"a" => "123"})
@@ -910,11 +925,11 @@ class JsonClientTest < MiniTest::Spec
   def test_client_can_put_multipart_responses
     url = "http://some.endpoint/some.json"
     stub_request(:put, url).
-      with(:body => %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
-           :headers => {
+      with(body: %r{------RubyFormBoundary\w+\r\nContent-Disposition: form-data; name="a"\r\n\r\n123\r\n------RubyFormBoundary\w+--\r\n},
+           headers: {
              'Content-Type' => %r{multipart/form-data; boundary=----RubyFormBoundary\w+}
            }).
-      to_return(:body => '{"b": "1"}', :status => 200)
+      to_return(body: '{"b": "1"}', status: 200)
 
     response = @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
     assert_equal "1", response["b"]
@@ -922,7 +937,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_put_multipart_should_raise_exception_if_not_found
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => '', :status => 404)
+    stub_request(:put, url).to_return(body: '', status: 404)
 
     assert_raises GdsApi::HTTPNotFound do
       @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
@@ -931,7 +946,7 @@ class JsonClientTest < MiniTest::Spec
 
   def test_put_multipart_should_raise_error_responses
     url = "http://some.endpoint/some.json"
-    stub_request(:put, url).to_return(:body => '', :status => 500)
+    stub_request(:put, url).to_return(body: '', status: 500)
 
     assert_raises GdsApi::HTTPServerError do
       @client.put_multipart("http://some.endpoint/some.json", {"a" => "123"})
@@ -952,7 +967,7 @@ class JsonClientTest < MiniTest::Spec
     ENV['GOVUK_APP_NAME'] = "api-tests"
 
     url = "http://some.other.endpoint/some.json"
-    stub_request(:get, url).to_return(:status => 200)
+    stub_request(:get, url).to_return(status: 200)
 
     GdsApi::JsonClient.new.get_json(url)