Added some test

aerogear · Apr 1, 2020 · 06ba658 · 06ba658
1 parent 8d2e817
commit 06ba658
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 8 deletions.
diff --git a/src/applications/ApplicationsAdmin.ts b/src/applications/ApplicationsAdmin.ts
@@ -6,13 +6,14 @@ export class ApplicationsAdmin {
     let url = `/applications`;
     if (filter && filter.id) {
       url = `${url}/${filter.id}`;
-      return (await api.get(url)).data;
-    } else {
-      let apps: PushApplication[] = (await api.get(url)).data;
-      if (filter) {
-        apps = applyPushApplicationFilter(apps, filter);
+      const res = (await api.get(url)).data;
+      if (res instanceof Array) {
+        return res;
       }
-      return apps;
+
+      return [res];
+    } else {
+      return applyPushApplicationFilter((await api.get(url)).data, filter);
     }
   }
 

diff --git a/src/applications/PushApplication.ts b/src/applications/PushApplication.ts
@@ -25,7 +25,7 @@ export interface PushApplication extends PushApplicationFilter {
  */
 export const applyPushApplicationFilter = (
   apps: PushApplication[],
-  filter: PushApplicationFilter
+  filter?: PushApplicationFilter
 ): PushApplication[] => {
   if (filter) {
     return apps.filter(

diff --git a/test/UnifiedPushAdminClient.test.ts b/test/UnifiedPushAdminClient.test.ts
@@ -19,7 +19,27 @@ describe('Applications Admin', () => {
     expect(res).toHaveLength(mockData.length);
     expect(mockedAxios.get).toHaveBeenCalledWith('/applications');
   });
-  it('test find with single filter', async () => {
+  it('test filter by id - returning singe result', async () => {
+    mockedAxios.get.mockImplementationOnce(() => Promise.resolve({ data: mockData.find(value => value.id === '2') }));
+
+    const res = await new UnifiedPushAdminClient('http://localhost:9999').applications.find({
+      id: '2',
+    });
+    expect(res).toHaveLength(1);
+    expect(mockedAxios.get).toHaveBeenCalledWith('/applications/2');
+  });
+
+  it('test filter by id - returning array with one object', async () => {
+    mockedAxios.get.mockImplementationOnce(() => Promise.resolve({ data: [mockData.find(value => value.id === '2')] }));
+
+    const res = await new UnifiedPushAdminClient('http://localhost:9999').applications.find({
+      id: '2',
+    });
+    expect(res).toHaveLength(1);
+    expect(mockedAxios.get).toHaveBeenCalledWith('/applications/2');
+  });
+
+  it('test find filter by Developer', async () => {
     mockedAxios.get.mockImplementationOnce(() => Promise.resolve({ data: mockData }));
 
     const res = await new UnifiedPushAdminClient('http://localhost:9999').applications.find({
@@ -28,6 +48,18 @@ describe('Applications Admin', () => {
     expect(res).toHaveLength(2);
     expect(mockedAxios.get).toHaveBeenCalledWith('/applications');
   });
+
+  it('test find filter by name', async () => {
+    mockedAxios.get.mockImplementationOnce(() => Promise.resolve({ data: mockData }));
+
+    const res = await new UnifiedPushAdminClient('http://localhost:9999').applications.find({
+      name: 'Application 3',
+    });
+    expect(res).toHaveLength(1);
+    expect(res[0]).toEqual(mockData.find(app => app.name === 'Application 3'));
+    expect(mockedAxios.get).toHaveBeenCalledWith('/applications');
+  });
+
   it('test find with multiple filter', async () => {
     mockedAxios.get.mockImplementationOnce(() => Promise.resolve({ data: mockData }));
 
@@ -61,6 +93,20 @@ describe('Variants Admin', () => {
     expect(mockedAxios.get).toHaveBeenCalledWith(`/applications/${appId}`);
   });
 
+  it('test filter by type', async () => {
+    const appId = '1';
+    const selectedApp = mockData.filter(app => app.id === appId)[0];
+    mockedAxios.get.mockImplementation(() =>
+      Promise.resolve({ data: selectedApp.variants!.filter(variant => variant.type === 'android') })
+    );
+
+    const res = await upsClient.variants.find(appId, { type: 'android' });
+    expect(res).toHaveLength(1);
+    expect(res[0].type).toEqual('android');
+    expect(res[0].name).toEqual('Variant 1');
+    expect(mockedAxios.get).toHaveBeenCalledWith(`/applications/${appId}/android`);
+  });
+
   it('test find with single filter', async () => {
     const appId = '1';
     const selectedApp = mockData.filter(app => app.id === appId)[0];