From 34ed387f7fc7b67d64e07529dec750a844207361 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Mon, 2 May 2022 18:34:20 +0200
Subject: [PATCH] test: remove useResult

---
 .../test-ssr-composition/src/components/ApolloExample.vue   | 5 +++--
 .../test-ssr-composition/src/components/ApolloLoading.vue   | 5 +++--
 .../test-ssr-composition/src/components/HelloWorld.vue      | 6 +++---
 .../test-e2e-composable-vue3/src/components/ChannelList.vue | 6 +++---
 .../test-e2e-composable-vue3/src/components/ChannelView.vue | 6 +++---
 .../test-e2e-composable-vue3/src/components/LazyQuery.vue   | 6 +++---
 .../src/components/NoSetupQuery.vue                         | 6 +++---
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.test-todo/test-ssr-composition/src/components/ApolloExample.vue b/.test-todo/test-ssr-composition/src/components/ApolloExample.vue
index 23ecab8..cd70fb6 100644
--- a/.test-todo/test-ssr-composition/src/components/ApolloExample.vue
+++ b/.test-todo/test-ssr-composition/src/components/ApolloExample.vue
@@ -1,12 +1,13 @@
 <script>
-import { useQuery, useResult } from '@vue/apollo-composable'
+import { computed } from '@vue/composition-api'
+import { useQuery } from '@vue/apollo-composable'
 import MESSAGES from '../graphql/Messages.gql'
 import MESSAGE_ADDED from '../graphql/MessageAdded.gql'
 
 export default {
   setup () {
     const { result, subscribeToMore } = useQuery(MESSAGES)
-    const messages = useResult(result, [])
+    const messages = computed(() => result.value?.messages ?? [])
 
     subscribeToMore({
       document: MESSAGE_ADDED,
diff --git a/.test-todo/test-ssr-composition/src/components/ApolloLoading.vue b/.test-todo/test-ssr-composition/src/components/ApolloLoading.vue
index f18acdc..838e27b 100644
--- a/.test-todo/test-ssr-composition/src/components/ApolloLoading.vue
+++ b/.test-todo/test-ssr-composition/src/components/ApolloLoading.vue
@@ -11,13 +11,14 @@
 </template>
 
 <script>
-import { useQuery, useResult, useQueryLoading } from '@vue/apollo-composable'
+import { computed } from '@vue/composition-api'
+import { useQuery, useQueryLoading } from '@vue/apollo-composable'
 import MESSAGES from '../graphql/Messages.gql'
 
 export default {
   setup () {
     const { result } = useQuery(MESSAGES)
-    const messages = useResult(result, [])
+    const messages = computed(() => result.value?.messages ?? [])
     return {
       messages,
       loading: useQueryLoading(),
diff --git a/.test-todo/test-ssr-composition/src/components/HelloWorld.vue b/.test-todo/test-ssr-composition/src/components/HelloWorld.vue
index abf3d44..7c87481 100644
--- a/.test-todo/test-ssr-composition/src/components/HelloWorld.vue
+++ b/.test-todo/test-ssr-composition/src/components/HelloWorld.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script>
-import { ref } from '@vue/composition-api'
-import { useQuery, useResult } from '@vue/apollo-composable'
+import { ref, computed } from '@vue/composition-api'
+import { useQuery } from '@vue/apollo-composable'
 import HELLO_WORLD from '../graphql/HelloWorld.gql'
 
 export default {
@@ -21,7 +21,7 @@ export default {
     const { result } = useQuery(HELLO_WORLD, () => ({
       name: name.value,
     }))
-    const hello = useResult(result)
+    const hello = computed(() => result.value?.hello)
     return {
       name,
       hello,
diff --git a/packages/test-e2e-composable-vue3/src/components/ChannelList.vue b/packages/test-e2e-composable-vue3/src/components/ChannelList.vue
index 965c2ea..0956105 100644
--- a/packages/test-e2e-composable-vue3/src/components/ChannelList.vue
+++ b/packages/test-e2e-composable-vue3/src/components/ChannelList.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import gql from 'graphql-tag'
-import { useQuery, useResult } from '@vue/apollo-composable'
-import { defineComponent } from 'vue'
+import { useQuery } from '@vue/apollo-composable'
+import { defineComponent, computed } from 'vue'
 
 interface Channel {
   id: string
@@ -18,7 +18,7 @@ export default defineComponent({
         }
       }
     `)
-    const channels = useResult(result, [])
+    const channels = computed(() => result.value?.channels ?? [])
 
     return {
       loading,
diff --git a/packages/test-e2e-composable-vue3/src/components/ChannelView.vue b/packages/test-e2e-composable-vue3/src/components/ChannelView.vue
index cc9fa8f..ea22368 100644
--- a/packages/test-e2e-composable-vue3/src/components/ChannelView.vue
+++ b/packages/test-e2e-composable-vue3/src/components/ChannelView.vue
@@ -1,7 +1,7 @@
 <script>
 import gql from 'graphql-tag'
-import { defineComponent, onMounted, ref, watch } from 'vue'
-import { useQuery, useResult } from '@vue/apollo-composable'
+import { defineComponent, onMounted, ref, watch, computed } from 'vue'
+import { useQuery } from '@vue/apollo-composable'
 import MessageItem from './MessageItem.vue'
 import MessageForm from './MessageForm.vue'
 
@@ -35,7 +35,7 @@ export default defineComponent({
     }), {
       notifyOnNetworkStatusChange: true,
     })
-    const channel = useResult(result)
+    const channel = computed(() => result.value?.channel)
 
     const messagesEl = ref()
 
diff --git a/packages/test-e2e-composable-vue3/src/components/LazyQuery.vue b/packages/test-e2e-composable-vue3/src/components/LazyQuery.vue
index 697bb27..2bb4fb9 100644
--- a/packages/test-e2e-composable-vue3/src/components/LazyQuery.vue
+++ b/packages/test-e2e-composable-vue3/src/components/LazyQuery.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import gql from 'graphql-tag'
-import { useLazyQuery, useResult } from '@vue/apollo-composable'
-import { defineComponent } from 'vue'
+import { useLazyQuery } from '@vue/apollo-composable'
+import { defineComponent, computed } from 'vue'
 
 export default defineComponent({
   setup () {
@@ -10,7 +10,7 @@ export default defineComponent({
         list
       }
     `)
-    const list = useResult(result, [])
+    const list = computed(() => result.value?.list ?? [])
 
     return {
       load,
diff --git a/packages/test-e2e-composable-vue3/src/components/NoSetupQuery.vue b/packages/test-e2e-composable-vue3/src/components/NoSetupQuery.vue
index b8cfe89..7e3b921 100644
--- a/packages/test-e2e-composable-vue3/src/components/NoSetupQuery.vue
+++ b/packages/test-e2e-composable-vue3/src/components/NoSetupQuery.vue
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { apolloClient } from '@/apollo'
 import gql from 'graphql-tag'
-import { provideApolloClient, useQuery, useResult } from '@vue/apollo-composable'
-import { defineComponent } from 'vue'
+import { provideApolloClient, useQuery } from '@vue/apollo-composable'
+import { defineComponent, computed } from 'vue'
 
 // Global query
 
@@ -11,7 +11,7 @@ const query = provideApolloClient(apolloClient)(() => useQuery(gql`
     hello
   }
 `))
-const hello = useResult(query.result, [])
+const hello = computed(() => query.result.value?.hello ?? '')
 
 export default defineComponent({
   setup () {