Add more relevant tests

Author: bidoubiwa

server/__tests__/content-types.test.js

@@ -98,7 +98,7 @@ describe('Tests content types', () => {
     expect(count).toEqual(2)
   })
 
-  test('Test fetching entries of content type', async () => {
+  test('Test fetching entries of a content type with default parameters', async () => {
     const contentTypeServices = createContentTypeService({
       strapi: fakeStrapi,
     })
@@ -107,19 +107,128 @@ describe('Tests content types', () => {
       contentType: 'api::restaurant.restaurant',
     })
 
+    expect(fakeStrapi.entityService.findMany).toHaveBeenCalledWith(
+      'api::restaurant.restaurant',
+      {
+        fields: '*',
+        start: 0,
+        limit: 500,
+        filters: {},
+        sort: {},
+        populate: '*',
+        publicationState: 'live',
+      }
+    )
+    expect(fakeStrapi.entityService.findMany).toHaveBeenCalledTimes(1)
     expect(count).toEqual([{ id: 1 }])
   })
 
-  test('Test fetching entries on non existing content type', async () => {
+  test('Test fetching entries of a content type with custom parameters', async () => {
     const contentTypeServices = createContentTypeService({
       strapi: fakeStrapi,
     })
 
     const count = await contentTypeServices.getEntries({
+      contentType: 'api::restaurant.restaurant',
+      fields: 'title',
+      start: 1,
+      limit: 2,
+      filters: { where: { title: 'hello' } },
+      sort: 'id',
+      populate: {},
+      publicationState: 'preview',
+    })
+
+    expect(fakeStrapi.entityService.findMany).toHaveBeenCalledWith(
+      'api::restaurant.restaurant',
+      {
+        fields: 'title',
+        start: 1,
+        limit: 2,
+        filters: { where: { title: 'hello' } },
+        sort: 'id',
+        populate: {},
+        publicationState: 'preview',
+      }
+    )
+    expect(fakeStrapi.entityService.findMany).toHaveBeenCalledTimes(1)
+    expect(count).toEqual([{ id: 1 }])
+  })
+
+  test('Test fetching entries on non existing content type', async () => {
+    const contentTypeServices = createContentTypeService({
+      strapi: fakeStrapi,
+    })
+
+    const entry = await contentTypeServices.getEntries({
+      contentType: 'api::test.test',
+    })
+
+    expect(fakeStrapi.entityService.findMany).toHaveBeenCalledTimes(0)
+    expect(entry).toEqual([])
+  })
+
+  test('Test fetching an entry of a content type with default parameters', async () => {
+    const contentTypeServices = createContentTypeService({
+      strapi: fakeStrapi,
+    })
+
+    const entry = await contentTypeServices.getEntry({
+      contentType: 'api::restaurant.restaurant',
+      id: 200,
+    })
+
+    expect(fakeStrapi.entityService.findOne).toHaveBeenCalledWith(
+      'api::restaurant.restaurant',
+      200,
+      {
+        fields: '*',
+        populate: '*',
+      }
+    )
+    expect(fakeStrapi.entityService.findOne).toHaveBeenCalledTimes(1)
+    expect(entry).toEqual([{ id: 1 }])
+  })
+
+  test('Test fetching an entry of a content type with custom parameters', async () => {
+    const contentTypeServices = createContentTypeService({
+      strapi: fakeStrapi,
+    })
+
+    const entry = await contentTypeServices.getEntry({
+      contentType: 'api::restaurant.restaurant',
+      id: 200,
+      fields: ['title'],
+      populate: {
+        subClass: true,
+      },
+    })
+
+    expect(fakeStrapi.entityService.findOne).toHaveBeenCalledWith(
+      'api::restaurant.restaurant',
+      200,
+      {
+        fields: ['title'],
+        populate: {
+          subClass: true,
+        },
+      }
+    )
+    expect(fakeStrapi.entityService.findOne).toHaveBeenCalledTimes(1)
+    expect(entry).toEqual([{ id: 1 }])
+  })
+
+  test('Test fetching an entry on a non existing content type', async () => {
+    const contentTypeServices = createContentTypeService({
+      strapi: fakeStrapi,
+    })
+
+    const count = await contentTypeServices.getEntry({
       contentType: 'api::test.test',
     })
 
-    expect(count).toEqual([])
+    expect(fakeStrapi.entityService.findOne).toHaveBeenCalledTimes(0)
+    expect(count).toEqual({})
   })
 
   test('Test operation in batches on entries', async () => {
@@ -137,8 +246,6 @@ describe('Tests content types', () => {
         })),
     })
 
-    console.log(entries)
-
     expect(entries[0].id).toEqual(2)
     expect(entries[0].contentType).toEqual(contentType)
   })

server/services/content-types/content-types.js

@@ -125,7 +125,7 @@ module.exports = ({ strapi }) => ({
    * More information: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/entity-service/crud.html#findone
    *
    * @param  {object} options
-   * @param  {string} [options.id] - Id of the entry.
+   * @param  {string | number} [options.id] - Id of the entry.
    * @param  {string | string[]} [options.fields] - Fields present in the returned entry.
    * @param  {object} [options.populate] - Relations, components and dynamic zones to populate.
    * @param  {string} [options.contentType] - Content type.
@@ -172,7 +172,7 @@ module.exports = ({ strapi }) => ({
     filters = {},
     sort = {},
     populate = '*',
-    publicationState,
+    publicationState = 'live',
   }) {
     const contentTypeUid = this.getContentTypeUid({ contentType })
     if (contentTypeUid === undefined) return []
@@ -184,7 +184,7 @@ module.exports = ({ strapi }) => ({
       filters,
       sort,
       populate,
-      publicationState: publicationState || 'live',
+      publicationState: publicationState,
     })
     // Safe guard in case the content-type is a single type.
     // In which case it is wrapped in an array for consistency.