From eaf1da7c393bae88c1cce950e27baaff64c09764 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Sun, 28 Nov 2021 18:49:58 +0100
Subject: [PATCH] fix: duplicate call to catchError, closes #1133

---
 packages/test-e2e/src/components/PartialError.vue | 2 +-
 packages/test-e2e/tests/e2e/specs/errorPolicy.js  | 2 +-
 packages/vue-apollo-option/src/smart-query.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/test-e2e/src/components/PartialError.vue b/packages/test-e2e/src/components/PartialError.vue
index 692c3b0..aad024c 100644
--- a/packages/test-e2e/src/components/PartialError.vue
+++ b/packages/test-e2e/src/components/PartialError.vue
@@ -15,7 +15,7 @@ function query (errorPolicy) {
       console.log(errorPolicy, result)
     },
     error (error) {
-      console.log(error)
+      console.log('Error', errorPolicy, error)
       this.errors[errorPolicy] = error
     },
   }
diff --git a/packages/test-e2e/tests/e2e/specs/errorPolicy.js b/packages/test-e2e/tests/e2e/specs/errorPolicy.js
index 9736a9f..7dd8325 100644
--- a/packages/test-e2e/tests/e2e/specs/errorPolicy.js
+++ b/packages/test-e2e/tests/e2e/specs/errorPolicy.js
@@ -8,7 +8,7 @@ describe('errorPolicy', () => {
 
     // None
     cy.get('.none .result').should('not.contain', 'good').should('not.contain', 'bad')
-    cy.get('.none .error').should('contain', 'Error: GraphQL error: An error')
+    cy.get('.none .error').should('contain', 'Error: An error')
 
     // Ignore
     cy.get('.ignore .result').should('contain', '"good":"good"').should('contain', '"bad":null}')
diff --git a/packages/vue-apollo-option/src/smart-query.js b/packages/vue-apollo-option/src/smart-query.js
index bf3715c..2242dda 100644
--- a/packages/vue-apollo-option/src/smart-query.js
+++ b/packages/vue-apollo-option/src/smart-query.js
@@ -175,7 +175,7 @@ export default class SmartQuery extends SmartApollo {
     // If `errorPolicy` is set to `all`, an error won't be thrown
     // Instead result will have an `errors` array of GraphQL Errors
     // so we need to reconstruct an error object similar to the normal one
-    if (anyErrors) {
+    if (!error && anyErrors) {
       const e = new Error(`GraphQL error: ${errors.map(e => e.message).join(' | ')}`)
       Object.assign(e, {
         graphQLErrors: errors,