Update tests and remove console.logs

Author: dwyfrequency

packages/analytics/src/helpers.test.ts

@@ -29,6 +29,7 @@ import {
 import { GtagCommand } from './constants';
 import { Deferred } from '@firebase/util';
 import { ConsentSettings } from './public-types';
+import { removeGtagScript } from '../testing/gtag-script-util';
 
 const fakeMeasurementId = 'abcd-efgh-ijkl';
 const fakeAppId = 'my-test-app-1234';
@@ -46,6 +47,11 @@ const fakeDynamicConfig: DynamicConfig = {
 const fakeDynamicConfigPromises = [Promise.resolve(fakeDynamicConfig)];
 
 describe('Gtag wrapping functions', () => {
+  afterEach(() => {
+    delete window['gtag'];
+    removeGtagScript();
+  });
+
   it('getOrCreateDataLayer is able to create a new data layer if none exists', () => {
     delete window['dataLayer'];
     expect(getOrCreateDataLayer('dataLayer')).to.deep.equal([]);
@@ -66,6 +72,15 @@ describe('Gtag wrapping functions', () => {
     expect(scriptTag!.src).to.contain(`id=${fakeMeasurementId}`);
   });
 
+  // The test above essentially already touches this functionality but it is still valuable
+  it('findGtagScriptOnPage returns gtag instance with matching data layer name', () => {
+    const defaultDataLayerName = 'dataLayer';
+    insertScriptTag(defaultDataLayerName, fakeMeasurementId);
+    const scriptTag = findGtagScriptOnPage(defaultDataLayerName);
+    expect(scriptTag!.src).to.contain(`l=${defaultDataLayerName}`);
+    expect(findGtagScriptOnPage('NON_EXISTENT_DATA_LAYER_ID')).to.be.null;
+  });
+
   describe('wrapOrCreateGtag() when user has not previously inserted a gtag script tag on this page', () => {
     afterEach(() => {
       delete window['gtag'];

packages/analytics/src/helpers.ts

@@ -320,13 +320,9 @@ export function wrapOrCreateGtag(
 /**
  * Returns first script tag in DOM matching our gtag url pattern.
  */
-// TODO: We'll have this take a datalayer name
-// We'll check if a script exists and if it has the same data layer name
 export function findGtagScriptOnPage(
   dataLayerName: string
 ): HTMLScriptElement | null {
-  console.log(findGtagScriptOnPage);
-  console.log(dataLayerName);
   const scriptTags = window.document.getElementsByTagName('script');
   for (const tag of Object.values(scriptTags)) {
     if (