refactor: clean up code

gatsbyjs · Apr 13, 2021 · 67f316c · 67f316c
1 parent 0992ebd
commit 67f316c
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 129 deletions.
diff --git a/e2e-tests/contentful/src/components/references/content-reference.js b/e2e-tests/contentful/src/components/references/content-reference.js
@@ -1,16 +1,7 @@
 import React from "react"
 
-export const ContentfulContentReference = ({
-  one,
-  many,
-  content_reference,
-  title,
-}) => {
-  const references = [
-    one,
-    ...(many || []),
-    ...(content_reference || []),
-  ].filter(Boolean)
+export const ContentfulContentReference = ({ one, many, title }) => {
+  const references = [one, ...(many || [])].filter(Boolean)
   return (
     <p data-cy-id="reference">
       [ContentfulReference] {title}: [

diff --git a/e2e-tests/contentful/src/pages/content-reference.js b/e2e-tests/contentful/src/pages/content-reference.js
@@ -53,40 +53,45 @@ export const pageQuery = graphql`
         contentful_id
         one {
           __typename
+          contentful_id
           ... on ContentfulText {
-            contentful_id
             title
             short
           }
           ... on ContentfulContentReference {
-            contentful_id
             title
-            content_reference {
+            one {
+              ... on ContentfulContentReference {
+                title
+              }
+            }
+            many {
               ... on ContentfulContentReference {
-                contentful_id
                 title
               }
             }
           }
         }
         many {
           __typename
+          contentful_id
           ... on ContentfulText {
-            contentful_id
             title
             short
           }
           ... on ContentfulNumber {
-            contentful_id
             title
             integer
           }
           ... on ContentfulContentReference {
-            contentful_id
             title
-            content_reference {
+            one {
+              ... on ContentfulContentReference {
+                title
+              }
+            }
+            many {
               ... on ContentfulContentReference {
-                id
                 title
               }
             }

diff --git a/e2e-tests/contentful/src/pages/rich-text.js b/e2e-tests/contentful/src/pages/rich-text.js
@@ -118,34 +118,46 @@ export const pageQuery = graphql`
               contentful_id
               title
               one {
+                __typename
+                contentful_id
+                ... on ContentfulText {
+                  title
+                  short
+                }
                 ... on ContentfulContentReference {
-                  contentful_id
                   title
-                  content_reference {
+                  one {
+                    ... on ContentfulContentReference {
+                      title
+                    }
+                  }
+                  many {
                     ... on ContentfulContentReference {
-                      contentful_id
                       title
                     }
                   }
                 }
               }
               many {
+                __typename
+                contentful_id
                 ... on ContentfulText {
-                  contentful_id
                   title
                   short
                 }
                 ... on ContentfulNumber {
-                  contentful_id
                   title
                   integer
                 }
                 ... on ContentfulContentReference {
-                  contentful_id
                   title
-                  content_reference {
+                  one {
+                    ... on ContentfulContentReference {
+                      title
+                    }
+                  }
+                  many {
                     ... on ContentfulContentReference {
-                      id
                       title
                     }
                   }