Add more tests for error handling

Author: kirillplatonov

lib/shopify_graphql/client.rb

@@ -11,8 +11,14 @@ def execute(query, **variables)
       Response.new(handle_response(e.response))
     rescue JSON::ParserError => e
       raise ServerError.new(e, "Invalid JSON response")
-    rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENETUNREACH, Net::ReadTimeout, Net::OpenTimeout, OpenSSL::SSL::SSLError, EOFError, Socket::ResolutionError => e
+    rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENETUNREACH, Net::ReadTimeout, Net::OpenTimeout, OpenSSL::SSL::SSLError, EOFError => e
       raise ServerError.new(e, "Network error")
+    rescue => e
+      if (defined?(Socket::ResolutionError) and e.is_a?(Socket::ResolutionError))
+        raise ServerError.new(response: response), "Network error: #{e.message}"
+      else
+        raise e
+      end
     end
 
     def parsed_body(response)

test/error_handling_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+class ErrorHandlingTest < ActiveSupport::TestCase
+  SIMPLE_QUERY = <<~GRAPHQL
+    query {
+      shop {
+        id
+        name
+        myshopifyDomain
+      }
+    }
+  GRAPHQL
+
+  test "handles invalid JSON response" do
+    fake("error_page.html", SIMPLE_QUERY)
+
+    assert_raises ShopifyGraphql::ServerError do
+      ShopifyGraphql.execute(SIMPLE_QUERY)
+    end
+  end
+
+  test "handles network error" do
+    fake_error(Errno::ECONNRESET)
+
+    assert_raises ShopifyGraphql::ServerError do
+      ShopifyGraphql.execute(SIMPLE_QUERY)
+    end
+  end
+
+  test "invalid input error" do
+    fake("mutations/invalid_input_error.json", SIMPLE_QUERY)
+
+    assert_raises ShopifyGraphql::ConnectionError do
+      ShopifyGraphql.execute(SIMPLE_QUERY)
+    end
+  end
+end

test/exceptions_test.rb

@@ -0,0 +1,27 @@
+{
+  "errors": [
+    {
+      "message": "Variable $input of type ProductInput! was provided invalid value for title1 (Field is not defined on ProductInput)",
+      "locations": [
+        {
+          "line": 1,
+          "column": 10
+        }
+      ],
+      "extensions": {
+        "value": {
+          "id": "gid://shopify/Product/8077118406833",
+          "title1": "Test Prod 1"
+        },
+        "problems": [
+          {
+            "path": [
+              "title1"
+            ],
+            "explanation": "Field is not defined on ProductInput"
+          }
+        ]
+      }
+    }
+  ]
+}

test/fixtures/mutations/invalid_input_error.json

@@ -19,6 +19,8 @@
 end
 
 class ActiveSupport::TestCase
+  API_PATH = "https://test-shop.myshopify.com/admin/api/2023-07/graphql.json"
+
   setup do
     session = ShopifyAPI::Auth::Session.new(shop: "test-shop.myshopify.com", access_token: "test-token")
     ShopifyAPI::Context.activate_session(session)
@@ -29,12 +31,16 @@ class ActiveSupport::TestCase
   end
 
   def fake(fixture_path, query, **variables)
-    api_path = "https://test-shop.myshopify.com/admin/api/2023-07/graphql.json"
     fixture = File.read File.expand_path("fixtures/#{fixture_path}", __dir__)
     body = { query: query, variables: variables }
 
-    stub_request(:post, api_path)
+    stub_request(:post, API_PATH)
       .with(body: body)
       .to_return(body: fixture)
   end
+
+  def fake_error(error_class)
+    stub_request(:post, API_PATH)
+      .to_raise(error_class)
+  end
 end