Revert apollo/client-related tests

Author: howard-e

client/components/GraphQLProvider/GraphQLProvider.jsx

@@ -25,6 +25,7 @@ const headerMiddleware = new ApolloLink((operation, forward) => {
 const client = new ApolloClient({
   link: concat(headerMiddleware, new HttpLink({ uri: '/api/graphql' })),
   cache: new InMemoryCache({
+    addTypename: false,
     typePolicies: {
       Query: {
         fields: {

client/package.json

@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/bocoup/aria-at-app#readme",
   "dependencies": {
-    "@apollo/client": "^3.13.9",
+    "@apollo/client": "^3.10.8",
     "@fortawesome/fontawesome-svg-core": "^6.7.2",
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.6",

client/tests/AddTestToQueueWithConfirmation.test.jsx

@@ -51,7 +51,10 @@ const setup = (props, mockMutation) => {
   });
   return render(
     <BrowserRouter>
-      <MockedProvider mocks={[]} cache={new InMemoryCache()}>
+      <MockedProvider
+        mocks={[]}
+        cache={new InMemoryCache({ addTypename: false })}
+      >
         <AddTestToQueueWithConfirmation {...props} />
       </MockedProvider>
     </BrowserRouter>

client/tests/AssignTesterDropdown.test.jsx

@@ -254,7 +254,7 @@ describe('AssignTesterDropdown', () => {
 
   it('assigns tester correctly and calls assignTester mutation', async () => {
     render(
-      <MockedProvider mocks={getMocks('nvda', 'chrome')}>
+      <MockedProvider mocks={getMocks('nvda', 'chrome')} addTypename={false}>
         <AssignTesterDropdown {...mockProps} />
       </MockedProvider>
     );
@@ -284,7 +284,7 @@ describe('AssignTesterDropdown', () => {
 
   it('assigns bot correctly and calls scheduleCollection mutation', async () => {
     render(
-      <MockedProvider mocks={getMocks('nvda', 'chrome')}>
+      <MockedProvider mocks={getMocks('nvda', 'chrome')} addTypename={false}>
         <AssignTesterDropdown {...mockProps} />
       </MockedProvider>
     );
@@ -311,7 +311,7 @@ describe('AssignTesterDropdown', () => {
   it('does not list bot when run does not support automation', async () => {
     await act(async () => {
       render(
-        <MockedProvider mocks={getMocks('jaws', 'chrome')}>
+        <MockedProvider mocks={getMocks('jaws', 'chrome')} addTypename={false}>
           <AssignTesterDropdown {...mockProps} />
         </MockedProvider>
       );
@@ -336,7 +336,10 @@ describe('AssignTesterDropdown', () => {
   it('only lists supported bot', async () => {
     await act(async () => {
       render(
-        <MockedProvider mocks={getMocks('voiceover_macos', 'safari_macos')}>
+        <MockedProvider
+          mocks={getMocks('voiceover_macos', 'safari_macos')}
+          addTypename={false}
+        >
           <AssignTesterDropdown {...mockProps} />
         </MockedProvider>
       );
@@ -375,7 +378,7 @@ describe('AssignTesterDropdown', () => {
     ];
 
     render(
-      <MockedProvider mocks={getMocks('nvda', 'chrome')}>
+      <MockedProvider mocks={getMocks('nvda', 'chrome')} addTypename={false}>
         <AssignTesterDropdown {...mockProps} />
       </MockedProvider>
     );

client/tests/BotRunTestStatusList.test.jsx

@@ -4,7 +4,6 @@
 import React from 'react';
 import { render, waitFor } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
-import { InMemoryCache } from '@apollo/client';
 import BotRunTestStatusList from '../components/BotRunTestStatusList';
 import { TEST_PLAN_RUNS_TEST_RESULTS_QUERY } from '../components/BotRunTestStatusList/queries';
 import '@testing-library/jest-dom';
@@ -42,7 +41,7 @@ test('correctly displays statuses for single COMPLETED test run', async () => {
   const mocks = getMocks(testPlanRuns);
 
   const screen = render(
-    <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+    <MockedProvider mocks={mocks} addTypename={false}>
       <BotRunTestStatusList testPlanReportId="1" />
     </MockedProvider>
   );
@@ -80,7 +79,7 @@ test('correctly ignores test results from a human-submitted test plan run', asyn
   const mocks = getMocks(testPlanRuns);
 
   const { getByText } = render(
-    <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+    <MockedProvider mocks={mocks} addTypename={false}>
       <BotRunTestStatusList testPlanReportId="1" />
     </MockedProvider>
   );
@@ -126,7 +125,7 @@ test('correctly ignores test results from a human-submitted test plan run with a
   const mocks = getMocks(testPlanRuns);
 
   const { getByText } = render(
-    <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+    <MockedProvider mocks={mocks} addTypename={false}>
       <BotRunTestStatusList testPlanReportId="1" />
     </MockedProvider>
   );
@@ -157,7 +156,7 @@ test('correctly displays statuses for CANCELLED test run', async () => {
   const mocks = getMocks(testPlanRuns);
 
   const { getByText } = render(
-    <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+    <MockedProvider mocks={mocks} addTypename={false}>
       <BotRunTestStatusList testPlanReportId="1" />
     </MockedProvider>
   );
@@ -202,7 +201,7 @@ test('correctly displays statuses for multiple RUNNING and QUEUED test runs', as
   const mocks = getMocks(testPlanRuns);
 
   const { getByText } = render(
-    <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+    <MockedProvider mocks={mocks} addTypename={false}>
       <BotRunTestStatusList testPlanReportId="1" />
     </MockedProvider>
   );

client/tests/StartBotRunButton.test.jsx

@@ -46,7 +46,10 @@ const setup = ({ mutateImpl } = {}) => {
 
   const utils = render(
     <BrowserRouter>
-      <MockedProvider mocks={[]} cache={new InMemoryCache()}>
+      <MockedProvider
+        mocks={[]}
+        cache={new InMemoryCache({ addTypename: false })}
+      >
         <ConfirmationModalProvider>
           <StartBotRunButton testPlanReport={testPlanReport} />
         </ConfirmationModalProvider>

client/tests/TestPlanReportStatusDialog.test.jsx

@@ -18,7 +18,10 @@ import { mockedTestPlanVersion } from './__mocks__/GraphQLMocks/TestPlanReportSt
 const setup = (props, mocks = []) => {
   return render(
     <BrowserRouter>
-      <MockedProvider mocks={mocks} cache={new InMemoryCache()}>
+      <MockedProvider
+        mocks={mocks}
+        cache={new InMemoryCache({ addTypename: false })}
+      >
         <TestPlanReportStatusDialog {...props} />
       </MockedProvider>
     </BrowserRouter>

client/tests/TestQueue.test.jsx

@@ -24,7 +24,10 @@ const setup = (mocks = []) => {
   return render(
     <BrowserRouter>
       <AriaLiveRegionProvider>
-        <MockedProvider mocks={mergedMocks} cache={new InMemoryCache()}>
+        <MockedProvider
+          mocks={mergedMocks}
+          cache={new InMemoryCache({ addTypename: false })}
+        >
           <TestQueue />
         </MockedProvider>
       </AriaLiveRegionProvider>

client/webpack.prod.js

@@ -3,9 +3,7 @@ const webpack = require('webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-  entry: {
-    bundle: ['core-js/stable', './index.js']
-  },
+  entry: ['core-js/stable', './index.js'],
   mode: 'production',
   module: {
     rules: [

yarn.lock

@@ -20,7 +20,7 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apollo/client@^3.13.9":
+"@apollo/client@^3.10.8":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.14.0.tgz#eda34b85ee03c6c0828ba21782419c8699feaf0b"
   integrity sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==