Fix typos and other oddities.

google · Mar 22, 2023 · 9e520a2 · 9e520a2
1 parent 52b4745
commit 9e520a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/assets/js/modules/analytics-4/datastore/report.test.js b/assets/js/modules/analytics-4/datastore/report.test.js
@@ -383,7 +383,7 @@ describe( 'modules/analytics-4 report', () => {
 					expect( isGatheringData() ).toBe( true );
 				} );
 
-				it( 'should return FALSE if the connnected GA4 property is older than treww days', async () => {
+				it( 'should return FALSE if the connnected GA4 property is older than three days', async () => {
 					muteFetch(
 						new RegExp(
 							'^/google-site-kit/v1/modules/analytics-4/data/data-available'

diff --git a/assets/js/modules/analytics/datastore/settings.js b/assets/js/modules/analytics/datastore/settings.js
@@ -281,8 +281,9 @@ export const getCanUseSnippet = createRegistrySelector( ( select ) => () => {
  * @return {boolean|undefined} True if the dashboard view is GA4, false if it is UA, or undefined if not loaded.
  */
 export const isGA4DashboardView = createRegistrySelector( ( select ) => () => {
-	const isGA4Enabled = isFeatureEnabled( 'ga4Reporting' );
-	if ( ! isGA4Enabled ) {
+	const ga4ReportingEnabled = isFeatureEnabled( 'ga4Reporting' );
+
+	if ( ! ga4ReportingEnabled ) {
 		return false;
 	}
 
@@ -307,12 +308,13 @@ export const isGA4DashboardView = createRegistrySelector( ( select ) => () => {
  *
  * @since n.e.x.t
  *
- * @return {boolean} True if the user should be prompted to switch to GA4 Dashboard, false otherwise, or undefined if not loaded.
+ * @return {boolean} True if the user should be prompted to switch to the GA4 Dashboard View, false otherwise, or undefined if not loaded.
  */
 export const shouldPromptGA4DashboardView = createRegistrySelector(
 	( select ) => () => {
-		const isGA4Enabled = isFeatureEnabled( 'ga4Reporting' );
-		if ( ! isGA4Enabled ) {
+		const ga4ReportingEnabled = isFeatureEnabled( 'ga4Reporting' );
+
+		if ( ! ga4ReportingEnabled ) {
 			return false;
 		}
 

diff --git a/assets/js/modules/analytics/datastore/settings.test.js b/assets/js/modules/analytics/datastore/settings.test.js
@@ -53,7 +53,7 @@ import {
 } from './settings';
 import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
 import { MODULES_TAGMANAGER } from '../../tagmanager/datastore/constants';
-import { enabledFeatures } from '../../../features';
+import { enabledFeatures, isFeatureEnabled } from '../../../features';
 
 describe( 'modules/analytics settings', () => {
 	let registry;
@@ -1046,8 +1046,8 @@ describe( 'modules/analytics settings', () => {
 
 		describe( 'shouldPromptGA4DashboardView', () => {
 			it( 'should return false when the `ga4Reporting` feature flag is not enabled', () => {
-				// Delete the `ga4Reporting` feature flag if it exists.
-				enabledFeatures.delete( 'ga4Reporting' );
+				// Verify the `ga4Reporting` feature flag is not enabled.
+				expect( isFeatureEnabled( 'ga4Reporting' ) ).toBe( false );
 
 				expect(
 					registry