only block registration when appRoute contains the exact basePath (#67125)

pgayvallet · pgayvallet · commit 9e5e5e91aad0 · 2020-05-25T10:31:16.000+02:00
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
@@ -174,6 +174,10 @@ describe('#setup()', () => {
       ).toThrowErrorMatchingInlineSnapshot(
         `"Cannot register an application route that includes HTTP base path"`
       );
+
+      expect(() =>
+        register(Symbol(), createApp({ id: 'app3', appRoute: '/base-path-i-am-not' }))
+      ).not.toThrow();
     });
   });
 
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
@@ -179,7 +179,7 @@ export class ApplicationService {
           throw new Error(
             `An application is already registered with the appRoute "${app.appRoute}"`
           );
-        } else if (basename && app.appRoute!.startsWith(basename)) {
+        } else if (basename && app.appRoute!.startsWith(`${basename}/`)) {
           throw new Error('Cannot register an application route that includes HTTP base path');
         }
 
@@ -208,7 +208,7 @@ export class ApplicationService {
           throw new Error('Applications cannot be registered after "setup"');
         } else if (this.apps.has(app.id)) {
           throw new Error(`An application is already registered with the id "${app.id}"`);
-        } else if (basename && appRoute!.startsWith(basename)) {
+        } else if (basename && appRoute!.startsWith(`${basename}/`)) {
           throw new Error('Cannot register an application route that includes HTTP base path');
         }
 
