chore(core): Refactor e2e tests to allow codegen to work again

packages/core/e2e/graphql/shop-definitions.ts

@@ -703,24 +703,3 @@ export const GET_PRODUCT_WITH_STOCK_LEVEL = gql`
         }
     }
 `;
-
-export const ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS = gql`
-    mutation AddItemToOrderWithCustomFields(
-        $productVariantId: ID!
-        $quantity: Int!
-        $customFields: OrderLineCustomFieldsInput
-    ) {
-        addItemToOrder(
-            productVariantId: $productVariantId
-            quantity: $quantity
-            customFields: $customFields
-        ) {
-            ...UpdatedOrder
-            ... on ErrorResult {
-                errorCode
-                message
-            }
-        }
-    }
-    ${UPDATED_ORDER_FRAGMENT}
-`;

packages/core/e2e/shop-order.e2e-spec.ts

@@ -83,6 +83,7 @@ import {
     SET_SHIPPING_ADDRESS,
     SET_SHIPPING_METHOD,
     TRANSITION_TO_STATE,
+    UPDATED_ORDER_FRAGMENT,
 } from './graphql/shop-definitions';
 import { assertThrowsWithMessage } from './utils/assert-throws-with-message';
 
@@ -1860,3 +1861,24 @@ export const LOG_OUT = gql`
         }
     }
 `;
+
+export const ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS = gql`
+    mutation AddItemToOrderWithCustomFields(
+        $productVariantId: ID!
+        $quantity: Int!
+        $customFields: OrderLineCustomFieldsInput
+    ) {
+        addItemToOrder(
+            productVariantId: $productVariantId
+            quantity: $quantity
+            customFields: $customFields
+        ) {
+            ...UpdatedOrder
+            ... on ErrorResult {
+                errorCode
+                message
+            }
+        }
+    }
+    ${UPDATED_ORDER_FRAGMENT}
+`;

packages/core/e2e/stock-control.e2e-spec.ts

@@ -49,7 +49,6 @@ import {
 } from './graphql/shared-definitions';
 import {
     ADD_ITEM_TO_ORDER,
-    ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS,
     ADD_PAYMENT,
     GET_PRODUCT_WITH_STOCK_LEVEL,
     SET_SHIPPING_ADDRESS,
@@ -933,6 +932,29 @@ describe('Stock control', () => {
     describe('OrderLines with same variant but different custom fields', () => {
         let orderId: string;
 
+        const ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS = `
+            mutation AddItemToOrderWithCustomFields(
+                $productVariantId: ID!
+                $quantity: Int!
+                $customFields: OrderLineCustomFieldsInput
+            ) {
+                addItemToOrder(
+                    productVariantId: $productVariantId
+                    quantity: $quantity
+                    customFields: $customFields
+                ) {
+                    ... on Order {
+                        id
+                        lines { id }
+                    }
+                    ... on ErrorResult {
+                        errorCode
+                        message
+                    }
+                }
+            }
+        `;
+
         it('correctly allocates stock', async () => {
             await shopClient.asUserWithCredentials('trevor_donnelly96@hotmail.com', 'test');
 
@@ -941,7 +963,7 @@ describe('Stock control', () => {
 
             expect(variant2.stockAllocated).toBe(0);
 
-            await shopClient.query<AddItemToOrder.Mutation, any>(ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS, {
+            await shopClient.query<AddItemToOrder.Mutation, any>(gql(ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS), {
                 productVariantId: variant2.id,
                 quantity: 1,
                 customFields: {
@@ -949,7 +971,7 @@ describe('Stock control', () => {
                 },
             });
             const { addItemToOrder } = await shopClient.query<AddItemToOrder.Mutation, any>(
-                ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS,
+                gql(ADD_ITEM_TO_ORDER_WITH_CUSTOM_FIELDS),
                 {
                     productVariantId: variant2.id,
                     quantity: 1,