Merge pull request #425 from MrChocolatine/patch-1

Unregister Services before they are registered

.changeset/twenty-worms-sip.md

@@ -0,0 +1,8 @@
+---
+"ember-browser-services": patch
+"test-app": patch
+---
+
+Unregister services before they are registered in `setupBrowserFakes()` 
+
+Fixes https://github.com/CrowdStrike/ember-browser-services/issues/413

ember-browser-services/src/test-support/index.ts

@@ -39,20 +39,24 @@ export function setupBrowserFakes(hooks: NestedHooks, options: Fakes): void {
     if (options.window) {
       let service = maybeMake(options.window, window);
 
+      owner.unregister('service:browser/window');
       owner.register('service:browser/window', service);
     }
 
     if (options.document) {
       let service = maybeMake(options.document, window.document);
 
+      owner.unregister('service:browser/document');
       owner.register('service:browser/document', service);
     }
 
     if (options.localStorage) {
+      owner.unregister('service:browser/local-storage');
       owner.register('service:browser/local-storage', FakeLocalStorageService);
     }
 
     if (options.sessionStorage) {
+      owner.unregister('service:browser/session-storage');
       owner.register(
         'service:browser/session-storage',
         FakeSessionStorageService
@@ -62,6 +66,7 @@ export function setupBrowserFakes(hooks: NestedHooks, options: Fakes): void {
     if (options.navigator) {
       let service = maybeMake(options.navigator, window.navigator);
 
+      owner.unregister('service:browser/navigator');
       owner.register('service:browser/navigator', service);
     }
   });

test-app/app/instance-initializers/lookup-browser-service.ts

@@ -0,0 +1,13 @@
+import { assert } from '@ember/debug';
+
+import type ApplicationInstance from '@ember/application/instance';
+
+export function initialize(application: ApplicationInstance) {
+  const windowService = application?.lookup('service:browser/window');
+
+  assert('Expected to have the window service', windowService);
+}
+
+export default {
+  initialize,
+};