From 7475eb29e6d4e52fa992fd216847d17baea644c4 Mon Sep 17 00:00:00 2001
From: Peter Lauck <griest024@gmail.com>
Date: Tue, 12 Jan 2021 09:55:05 -0500
Subject: [PATCH] test(contact,newsletter): fix page name assertion

---
 .../integration-tests/drivers/hubspot.spec.ts     | 15 ++++++++-------
 .../integration-tests/drivers/hubspot.spec.ts     | 15 +++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/libs/contact/integration-tests/drivers/hubspot.spec.ts b/libs/contact/integration-tests/drivers/hubspot.spec.ts
index 2e49e10db4..2d76664156 100644
--- a/libs/contact/integration-tests/drivers/hubspot.spec.ts
+++ b/libs/contact/integration-tests/drivers/hubspot.spec.ts
@@ -39,16 +39,17 @@ describe('DaffContactHubspotDriver', () => {
 	describe('when sending', () => {
 		it('should send a submission', () => {
 			const forumSubmission = { email: 'test@email.com' };
-			const mockReq = of(forumSubmission);
-			contactService.send(forumSubmission).subscribe();
+			contactService.send(forumSubmission).subscribe((resp) => {
+        expect(resp).toEqual(forumSubmission);
+      });
 			const req = httpMock.expectOne(
-				`${'https://api.hsforms.com/submissions/v3/integration/submit/123123/123123'}`,
+				'https://api.hsforms.com/submissions/v3/integration/submit/123123/123123',
 			);
-			expect(req.request.body).toEqual({
+			expect(req.request.body).toEqual(jasmine.objectContaining({
 				fields: [Object({ name: 'email', value: 'test@email.com' })],
-				context: Object({ hutk: null, pageUri: '/', pageName: '' }),
-			});
-			req.flush(mockReq);
+				context: Object({ hutk: null, pageUri: '/', pageName: jasmine.any(String) }),
+			}));
+			req.flush(forumSubmission);
 			httpMock.verify();
     });
 
diff --git a/libs/newsletter/integration-tests/drivers/hubspot.spec.ts b/libs/newsletter/integration-tests/drivers/hubspot.spec.ts
index c280812cd9..2dc73df52d 100644
--- a/libs/newsletter/integration-tests/drivers/hubspot.spec.ts
+++ b/libs/newsletter/integration-tests/drivers/hubspot.spec.ts
@@ -6,11 +6,12 @@ import { RouterTestingModule } from '@angular/router/testing';
 import {
 	DaffNewsletterHubSpotDriverModule,
 	DaffNewsletterDriver,
-	DaffNewsletterServiceInterface
+	DaffNewsletterServiceInterface,
+  DaffNewsletterSubmission
 } from '@daffodil/newsletter';
 
 describe('DaffNewsletterHubspotDriver', () => {
-	let newsletterService: DaffNewsletterServiceInterface<any, any>;
+	let newsletterService: DaffNewsletterServiceInterface<DaffNewsletterSubmission, any>;
 	let httpMock: HttpTestingController;
 
 	beforeEach(() => {
@@ -27,9 +28,7 @@ describe('DaffNewsletterHubspotDriver', () => {
 
 		httpMock = TestBed.inject(HttpTestingController);
 
-		newsletterService = TestBed.inject(
-			DaffNewsletterDriver
-		);
+		newsletterService = TestBed.inject(DaffNewsletterDriver);
 	});
 
 	it('should provide an instance of the DaffNewsletterDriver', () => {
@@ -41,7 +40,11 @@ describe('DaffNewsletterHubspotDriver', () => {
 		newsletterService.send(newsletterSubmission).subscribe((resp) => {
 			expect(resp).toEqual(newsletterSubmission);
 		});
-		const req = httpMock.expectOne('https://api.hsforms.com/submissions/v3/integration/submit/123123/123123');
+    const req = httpMock.expectOne('https://api.hsforms.com/submissions/v3/integration/submit/123123/123123');
+    expect(req.request.body).toEqual(jasmine.objectContaining({
+      fields: [Object({ name: 'email', value: 'test@email.com' })],
+      context: Object({ hutk: null, pageUri: '/', pageName: jasmine.any(String) }),
+    }));
 		req.flush(newsletterSubmission);
 		httpMock.verify();
 	})