remove ember-fetch

Author: Gaurav0

addon/services/apollo.js

@@ -2,7 +2,6 @@ import { get, set, setProperties, defineProperty } from '@ember/object';
 import { sendEvent } from '@ember/object/events';
 import RSVP from 'rsvp';
 import Service from '@ember/service';
-import fetch from 'fetch';
 import { A } from '@ember/array';
 import {
   ApolloClient,
@@ -14,7 +13,7 @@ import { isArray } from '@ember/array';
 import { isNone, isPresent } from '@ember/utils';
 import { run, next } from '@ember/runloop';
 import { QueryManager } from '../index';
-import { waitForPromise } from '@ember/test-waiters';
+import { waitForFetch } from '@ember/test-waiters';
 import { tracked } from '@glimmer/tracking';
 import { macroCondition, isTesting } from '@embroider/macros';
 
@@ -185,7 +184,7 @@ export default class ApolloService extends Service {
    * @public
    */
   mutate(opts, resultKey) {
-    return waitForPromise(
+    return waitForFetch(
       new RSVP.Promise((resolve, reject) => {
         this.client
           .mutate(opts)
@@ -235,7 +234,7 @@ export default class ApolloService extends Service {
       subscription && subscription.unsubscribe();
     }
 
-    return waitForPromise(
+    return waitForFetch(
       new RSVP.Promise((resolve, reject) => {
         // TODO: add an error function here for handling errors
         subscription = observable.subscribe({
@@ -267,7 +266,7 @@ export default class ApolloService extends Service {
 
     const obj = new EmberApolloSubscription();
 
-    return waitForPromise(
+    return waitForFetch(
       new RSVP.Promise((resolve, reject) => {
         let subscription = observable.subscribe({
           next: (newData) => {
@@ -302,7 +301,7 @@ export default class ApolloService extends Service {
    * @public
    */
   query(opts, resultKey) {
-    return waitForPromise(
+    return waitForFetch(
       new RSVP.Promise((resolve, reject) => {
         this.client
           .query(opts)
@@ -353,7 +352,7 @@ export default class ApolloService extends Service {
       subscription && subscription.unsubscribe();
     }
 
-    return waitForPromise(
+    return waitForFetch(
       new RSVP.Promise((resolve, reject) => {
         subscription = observable.subscribe({
           next: newDataFunc(observable, resultKey, resolve, unsubscribe),

package.json

@@ -39,8 +39,8 @@
   "dependencies": {
     "@apollo/client": "^3.5.10",
     "@ember/string": "^3.1.1",
-    "@ember/test-waiters": "~3.0.1",
-    "@embroider/macros": "^1.5.0",
+    "@ember/test-waiters": "^4.1.0",
+    "@embroider/macros": "^1.18.0",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-graphql-filter": "^1.0.0",
     "ember-auto-import": "^2.4.3",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "^7.17.7",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.8.1",
+    "@ember/test-helpers": "^4.0.4",
     "@embroider/test-setup": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "babel-eslint": "^10.1.0",
@@ -61,10 +61,9 @@
     "ember-cli-terser": "^4.0.2",
     "ember-compatibility-helpers": "^1.2.6",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.0.0",
+    "ember-qunit": "^8.1.1",
     "ember-resolver": "^8.0.3",
     "ember-source": "~4.8.0",
     "ember-source-channel-url": "^3.0.0",

testem.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
+  framework: 'qunit',
   disable_watching: true,
   client_decycle_depth: 10,
   launch_in_ci: ['Chrome'],