yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 22:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update test on /api

Browse Source
This commit is contained in:
Alexandre Bodin 2021-09-07 21:29:34 +02:00
parent 37bacdb691
commit 566805c8ae
26 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/strapi/tests/api/basic-compo-repeatable.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -56,7 +56,7 @@ describe('Core API - Basic + compo', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic-compo.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -55,7 +55,7 @@ describe('Core API - Basic + compo', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic-dp-compo-repeatable.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -57,7 +57,7 @@ describe('Core API - Basic + compo + draftAndPublish', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic-dp-compo.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -56,7 +56,7 @@ describe('Core API - Basic + compo + draftAndPublish', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic-dp.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -54,7 +54,7 @@ describe('Core API - Basic + draftAndPublish', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic-dz.test.e2e.js
View File

@ -4,7 +4,7 @@ const _ = require('lodash');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -55,7 +55,7 @@ describe('Core API - Basic + dz', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

4
packages/core/strapi/tests/api/basic.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -48,7 +48,7 @@ describe('Core API - Basic', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

6
packages/core/strapi/tests/components/repeatable-not-required-min-max.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -40,8 +40,8 @@ describe('Non repeatable and Not required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

6
packages/core/strapi/tests/components/repeatable-not-required.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -38,8 +38,8 @@ describe('Non repeatable and Not required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

6
packages/core/strapi/tests/components/repeatable-required-min-max.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -40,8 +40,8 @@ describe('Non repeatable and Not required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

6
packages/core/strapi/tests/components/repeatable-required.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -38,8 +38,8 @@ describe('Non repeatable and Not required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

6
packages/core/strapi/tests/components/single-not-required.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -38,8 +38,8 @@ describe('Non repeatable and Not required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

6
packages/core/strapi/tests/components/single-required.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -38,8 +38,8 @@ describe('Non repeatable and required component', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withcomponents');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withcomponents');
});
afterAll(async () => {

7
packages/core/strapi/tests/deepFiltering.test.e2e.js
View File

@ -4,7 +4,10 @@
const _ = require('lodash');
const { createStrapiInstance } = require('../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../test/helpers/builder');
const { createAuthRequest, transformToRESTResource } = require('../../../../test/helpers/request');
const {
createContentAPIRequest,
transformToRESTResource,
} = require('../../../../test/helpers/request');
const builder = createTestBuilder();
const data = {
@ -89,7 +92,7 @@ describe('Deep Filtering API', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
Object.assign(
data,

6
packages/core/strapi/tests/dynamiczones/simple.test.e2e.js
View File

@ -2,7 +2,7 @@
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -87,8 +87,8 @@ describe('Not required dynamiczone', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withdynamiczones');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withdynamiczones');
});
afterAll(async () => {

8
packages/core/strapi/tests/dynamiczones/with-media.test.e2e.js
View File

@ -5,7 +5,7 @@ const path = require('path');
const { createTestBuilder } = require('../../../../../test/helpers/builder');
const { createStrapiInstance } = require('../../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../../test/helpers/request');
let strapi;
let rq;
@ -77,10 +77,10 @@ describe('Not required dynamiczone', () => {
strapi = await createStrapiInstance();
baseRq = await createAuthRequest({ strapi });
baseRq = await createContentAPIRequest({ strapi });
rq = await createAuthRequest({ strapi });
rq.setURLPrefix('/withdynamiczonemedias');
rq = await createContentAPIRequest({ strapi });
rq.setURLPrefix('/api/withdynamiczonemedias');
});
afterAll(async () => {

4
packages/core/strapi/tests/endpoint.test.e2e.js
View File

@ -2,7 +2,7 @@
// Helpers.
const { createStrapiInstance } = require('../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../test/helpers/request');
const { createTestBuilder } = require('../../../../test/helpers/builder');
const modelsUtils = require('../../../../test/helpers/models');
@ -29,7 +29,7 @@ describe('Create Strapi API End to End', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
});
afterAll(async () => {

7
packages/core/strapi/tests/filtering.test.e2e.js
View File

@ -4,7 +4,10 @@
const _ = require('lodash');
const { createStrapiInstance } = require('../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../test/helpers/builder');
const { createAuthRequest, transformToRESTResource } = require('../../../../test/helpers/request');
const {
createContentAPIRequest,
transformToRESTResource,
} = require('../../../../test/helpers/request');
const builder = createTestBuilder();
let strapi;
@ -89,7 +92,7 @@ describe('Filtering API', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
Object.assign(
data,

4
packages/core/strapi/tests/publication-state.test.e2e.js
View File

@ -1,7 +1,7 @@
'use strict';
const { createStrapiInstance } = require('../../../../test/helpers/strapi');
const { createAuthRequest } = require('../../../../test/helpers/request');
const { createContentAPIRequest } = require('../../../../test/helpers/request');
const { createTestBuilder } = require('../../../../test/helpers/builder');
const builder = createTestBuilder();
@ -152,7 +152,7 @@ describe('Publication State', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
Object.assign(data, builder.sanitizedFixtures(strapi));
});

7
packages/core/strapi/tests/search.test.e2e.js
View File

@ -3,7 +3,10 @@
// Test an API with all the possible filed types and simple filtering (no deep filtering, no relations)
const { createStrapiInstance } = require('../../../../test/helpers/strapi');
const { createTestBuilder } = require('../../../../test/helpers/builder');
const { createAuthRequest, transformToRESTResource } = require('../../../../test/helpers/request');
const {
createContentAPIRequest,
transformToRESTResource,
} = require('../../../../test/helpers/request');
const builder = createTestBuilder();
let rq;
@ -127,7 +130,7 @@ describe('Search query', () => {
.build();
strapi = await createStrapiInstance();
rq = await createAuthRequest({ strapi });
rq = await createContentAPIRequest({ strapi });
data.bed = builder.sanitizedFixturesFor(bedModel.name, strapi);
});

10
packages/core/strapi/tests/single-type.test.e2e.js
View File

@ -27,16 +27,6 @@ describe('Content Manager single types', () => {
strapi = await createStrapiInstance();
strapi.container.get('content-api').auth.register({
name: 'test-strategy',
authenticate() {
return { authenticated: true };
},
verify() {
return;
},
});
rq = await createContentAPIRequest({ strapi });
});

4
packages/core/upload/server/controllers/index.js
View File

@ -1,7 +1,7 @@
'use strict';
const uploadController = require('./upload');
const upload = require('./upload');
module.exports = {
upload: uploadController,
upload,
};

9
packages/core/upload/server/controllers/upload.js
View File

@ -38,18 +38,11 @@ module.exports = {
getSettings: resolveControllerMethod('getSettings'),
async upload(ctx) {
const isUploadDisabled = _.get(strapi.plugins, 'upload.config.enabled', true) === false;
if (isUploadDisabled) {
throw strapi.errors.badRequest(null, {
errors: [{ id: 'Upload.status.disabled', message: 'File upload is disabled' }],
});
}
const {
query: { id },
request: { files: { files } = {} },
} = ctx;
const controller = resolveController(ctx);
if (id && (_.isEmpty(files) || files.size === 0)) {

2
packages/core/upload/server/controllers/upload/api.js
View File

@ -7,7 +7,7 @@ const { getService } = require('../../utils');
const sanitize = (data, options = {}) => {
return sanitizeEntity(data, {
model: strapi.getModel('file', 'upload'),
model: strapi.getModel('plugin::upload.file'),
...options,
});
};

2
packages/core/upload/server/services/upload.js
View File

@ -53,7 +53,7 @@ const combineFilters = params => {
module.exports = ({ strapi }) => ({
emitEvent(event, data) {
const modelDef = strapi.getModel('file', 'upload');
const modelDef = strapi.getModel('plugin::upload.file');
strapi.eventHub.emit(event, { media: sanitizeEntity(data, { model: modelDef }) });
},

10
test/helpers/strapi.js
View File

@ -22,6 +22,16 @@ const createStrapiInstance = async ({ ensureSuperAdmin = true, logLevel = 'fatal
await instance.load();
instance.container.get('content-api').auth.register({
name: 'test-strategy',
authenticate() {
return { authenticated: true };
},
verify() {
return;
},
});
instance.log.level = logLevel;
instance.server.mount();