add tests

elastic · Apr 29, 2020 · 8fb0107 · 8fb0107
1 parent 484f9f9
commit 8fb0107
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
@@ -711,23 +711,27 @@ describe('#start()', () => {
     it('preserves trailing slash when path contains a hash', async () => {
       const { register } = service.setup(setupDeps);
 
-      register(Symbol(), createApp({ id: 'app2', appRoute: '/custom/path' }));
+      register(Symbol(), createApp({ id: 'app2', appRoute: '/custom/app-path' }));
 
       const { navigateToApp } = await service.start(startDeps);
-      await navigateToApp('myTestApp', { path: '#/' });
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp#/', undefined);
+      await navigateToApp('app2', { path: '#/' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/app-path#/', undefined);
+      MockHistory.push.mockClear();
+
+      await navigateToApp('app2', { path: '#/foo/bar/' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/app-path#/foo/bar/', undefined);
       MockHistory.push.mockClear();
 
-      await navigateToApp('myTestApp', { path: '#/foo/bar/' });
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp#/foo/bar/', undefined);
+      await navigateToApp('app2', { path: '/path#/' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/app-path/path#/', undefined);
       MockHistory.push.mockClear();
 
-      await navigateToApp('myTestApp', { path: '/path#/' });
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp/path#/', undefined);
+      await navigateToApp('app2', { path: '/path#/hash/' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/app-path/path#/hash/', undefined);
       MockHistory.push.mockClear();
 
-      await navigateToApp('myTestApp', { path: '/path#/hash/' });
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp/path#/hash/', undefined);
+      await navigateToApp('app2', { path: '/path/' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/app-path/path', undefined);
       MockHistory.push.mockClear();
     });
 

diff --git a/src/core/public/application/utils.test.ts b/src/core/public/application/utils.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { removeSlashes } from './utils';
+import { removeSlashes, appendAppPath } from './utils';
 
 describe('removeSlashes', () => {
   it('only removes duplicates by default', () => {
@@ -51,3 +51,21 @@ describe('removeSlashes', () => {
     ).toEqual('some/url/to');
   });
 });
+
+describe('appendAppPath', () => {
+  it('appends the appBasePath with given path', () => {
+    expect(appendAppPath('/app/my-app', '/some-path')).toEqual('/app/my-app/some-path');
+    expect(appendAppPath('/app/my-app/', 'some-path')).toEqual('/app/my-app/some-path');
+    expect(appendAppPath('/app/my-app', 'some-path')).toEqual('/app/my-app/some-path');
+    expect(appendAppPath('/app/my-app', '')).toEqual('/app/my-app');
+  });
+
+  it('preserves the trailing slash only if included in the hash', () => {
+    expect(appendAppPath('/app/my-app', '/some-path/')).toEqual('/app/my-app/some-path');
+    expect(appendAppPath('/app/my-app', '/some-path#/')).toEqual('/app/my-app/some-path#/');
+    expect(appendAppPath('/app/my-app', '/some-path#/hash/')).toEqual(
+      '/app/my-app/some-path#/hash/'
+    );
+    expect(appendAppPath('/app/my-app', '/some-path#/hash')).toEqual('/app/my-app/some-path#/hash');
+  });
+});