Move away from deprecated things

kamilkisiela · Oct 23, 2024 · 56e2b18 · 56e2b18
1 parent a564953
commit 56e2b18
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 35 deletions.
diff --git a/.changeset/long-apes-punch.md b/.changeset/long-apes-punch.md
@@ -0,0 +1,5 @@
+---
+'apollo-angular': patch
+---
+
+Move away from deprecated things
diff --git a/packages/apollo-angular/http/src/http-batch-link.ts b/packages/apollo-angular/http/src/http-batch-link.ts
@@ -160,7 +160,7 @@ export class HttpBatchLinkHandler extends ApolloLink {
     const context: Context & { skipBatching?: boolean } = operation.getContext();
 
     if (context.skipBatching) {
-      return Math.random().toString(36).substr(2, 9);
+      return Math.random().toString(36).substring(2, 11);
     }
 
     const headers =

diff --git a/packages/apollo-angular/http/tests/http-batch-link.spec.ts b/packages/apollo-angular/http/tests/http-batch-link.spec.ts
@@ -1,5 +1,5 @@
-import { HttpClientModule, HttpHeaders } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpHeaders, provideHttpClient } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { ApolloLink, execute, gql, Operation } from '@apollo/client/core';
 import { HttpBatchLink } from '../src/http-batch-link';
@@ -14,8 +14,7 @@ describe('HttpBatchLink', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, HttpClientTestingModule],
-      providers: [HttpBatchLink],
+      providers: [provideHttpClient(), provideHttpClientTesting(), HttpBatchLink],
     });
     httpLink = TestBed.inject(HttpBatchLink);
     httpBackend = TestBed.inject(HttpTestingController);

diff --git a/packages/apollo-angular/http/tests/http-link.spec.ts b/packages/apollo-angular/http/tests/http-link.spec.ts
@@ -1,7 +1,7 @@
 import { print, stripIgnoredCharacters } from 'graphql';
 import { mergeMap } from 'rxjs/operators';
-import { HttpClientModule, HttpHeaders } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpHeaders, provideHttpClient } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { ApolloLink, execute, gql, InMemoryCache } from '@apollo/client/core';
 import { Apollo } from '../../src';
@@ -17,8 +17,7 @@ describe('HttpLink', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, HttpClientTestingModule],
-      providers: [HttpLink, Apollo],
+      providers: [provideHttpClient(), provideHttpClientTesting(), HttpLink, Apollo],
     });
     httpLink = TestBed.inject(HttpLink);
     httpBackend = TestBed.inject(HttpTestingController);
@@ -544,7 +543,7 @@ describe('HttpLink', () => {
   });
 
   test('should work with mergeMap', done => {
-    const apollo: Apollo = TestBed.get(Apollo);
+    const apollo = TestBed.inject(Apollo);
 
     const op1 = {
       query: gql`

diff --git a/packages/apollo-angular/http/tests/ssr.spec.ts b/packages/apollo-angular/http/tests/ssr.spec.ts
@@ -1,7 +1,7 @@
-import { filter, first } from 'rxjs/operators';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { firstValueFrom } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { ApplicationRef, Component, destroyPlatform, getPlatform, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
 import {
   INITIAL_CONFIG,
   platformServer,
@@ -66,12 +66,8 @@ describe.skip('integration', () => {
 
     @NgModule({
       declarations: [AsyncServerApp],
-      imports: [
-        BrowserModule.withServerTransition({ appId: 'async-server' }),
-        ServerModule,
-        HttpClientTestingModule,
-      ],
-      providers: [HttpLink],
+      imports: [ServerModule],
+      providers: [provideHttpClientTesting(), HttpLink],
       bootstrap: [AsyncServerApp],
     })
     class AsyncServerModule {}
@@ -87,12 +83,7 @@ describe.skip('integration', () => {
       ]);
       const moduleRef = await platform.bootstrapModule(AsyncServerModule);
       const applicationRef: ApplicationRef = moduleRef.injector.get(ApplicationRef);
-      await applicationRef.isStable
-        .pipe(
-          filter((isStable: boolean) => isStable),
-          first(),
-        )
-        .toPromise();
+      await firstValueFrom(applicationRef.isStable.pipe(filter(isStable => isStable)));
       const str = platform.injector.get(PlatformState).renderToString();
 
       expect(clearNgVersion(str)).toMatchSnapshot();

diff --git a/packages/apollo-angular/testing/tests/integration.spec.ts b/packages/apollo-angular/testing/tests/integration.spec.ts
@@ -176,8 +176,8 @@ describe('Integration', () => {
       ],
     });
 
-    const apollo: Apollo = TestBed.get(Apollo);
-    const backend: ApolloTestingController = TestBed.get(ApolloTestingController);
+    const apollo = TestBed.inject(Apollo);
+    const backend = TestBed.inject(ApolloTestingController);
 
     const query = gql`
       {

diff --git a/packages/apollo-angular/tests/Apollo.spec.ts b/packages/apollo-angular/tests/Apollo.spec.ts
@@ -217,7 +217,7 @@ describe('Apollo', () => {
           obs.subscribe({
             error,
             complete: () => {
-              expect(error).not.toBeCalled();
+              expect(error).not.toHaveBeenCalled();
               done();
             },
           });
@@ -240,11 +240,11 @@ describe('Apollo', () => {
 
       const obs = apollo.query({} as any);
 
-      expect(client.query).not.toBeCalled();
+      expect(client.query).not.toHaveBeenCalled();
 
       obs.subscribe({
         complete: () => {
-          expect(client.query).toBeCalled();
+          expect(client.query).toHaveBeenCalled();
           done();
         },
       });
@@ -371,7 +371,7 @@ describe('Apollo', () => {
           obs.subscribe({
             error,
             complete: () => {
-              expect(error).not.toBeCalled();
+              expect(error).not.toHaveBeenCalled();
               done();
             },
           });
@@ -394,11 +394,11 @@ describe('Apollo', () => {
 
       const obs = apollo.mutate({} as any);
 
-      expect(client.mutate).not.toBeCalled();
+      expect(client.mutate).not.toHaveBeenCalled();
 
       obs.subscribe({
         complete: () => {
-          expect(client.mutate).toBeCalled();
+          expect(client.mutate).toHaveBeenCalled();
           done();
         },
       });

diff --git a/packages/apollo-angular/tests/integration.spec.ts b/packages/apollo-angular/tests/integration.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 import { InMemoryCache } from '@apollo/client/core';
 import { mockSingleLink } from '@apollo/client/testing';
@@ -8,8 +8,8 @@ describe('Integration', () => {
   describe('default', () => {
     beforeEach(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientModule],
         providers: [
+          provideHttpClient(),
           provideApollo(() => {
             return {
               link: mockSingleLink(),