Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fixes: e2e test for clone

Browse source
This commit is contained in:
arpitnath 2023-10-27 05:05:20 +05:30
parent 6898d82cac
commit 215bc6e61a
3 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/src/services/app_import_export.service.ts
View file

@ -158,14 +158,17 @@ export class AppImportExportService {
.orderBy('pages.created_at', 'ASC')
.getMany();
const components = await manager
.createQueryBuilder(Component, 'components')
.leftJoinAndSelect('components.layouts', 'layouts')
.where('components.pageId IN(:...pageId)', {
pageId: pages.map((v) => v.id),
})
.orderBy('components.created_at', 'ASC')
.getMany();
const components =
pages.length > 0
? await manager
.createQueryBuilder(Component, 'components')
.leftJoinAndSelect('components.layouts', 'layouts')
.where('components.pageId IN(:...pageId)', {
pageId: pages.map((v) => v.id),
})
.orderBy('components.created_at', 'ASC')
.getMany()
: [];
const events = await manager
.createQueryBuilder(EventHandler, 'event_handlers')
@ -220,12 +223,13 @@ export class AppImportExportService {
: convertSinglePageSchemaToMultiPageSchema(appParams);
schemaUnifiedAppParams.name = appName;
const importedAppTooljetVersion = extractMajorVersion(tooljetVersion);
const importedAppTooljetVersion = !cloning && extractMajorVersion(tooljetVersion);
const isNormalizedAppDefinitionSchema = cloning
? true
: isTooljetVersionWithNormalizedAppDefinitionSchem(importedAppTooljetVersion);
const importedApp = await this.createImportedAppForUser(this.entityManager, schemaUnifiedAppParams, user);
await this.setupImportedAppAssociations(
this.entityManager,
importedApp,
@ -257,6 +261,7 @@ export class AppImportExportService {
createdAt: new Date(),
updatedAt: new Date(),
});
await manager.save(importedApp);
return importedApp;
}, [{ dbConstraint: DataBaseConstraints.APP_NAME_UNIQUE, message: 'This app name is already taken.' }]);

40
server/test/controllers/apps.e2e-spec.ts
View file

@ -508,7 +508,7 @@ describe('apps controller', () => {
});
});
describe('POST /api/apps/:id/clone', () => {
describe('POST /api/v2/resources/clone', () => {
it('should be able to clone the app if user group is admin', async () => {
const adminUserData = await createUser(app, {
email: 'admin@tooljet.io',
@ -543,31 +543,37 @@ describe('apps controller', () => {
await createApplicationVersion(app, application);
const payload = {
app: [{ id: application.id, name: `${application.name}_Copy` }],
organization_id: application.organizationId,
};
let response = await request(app.getHttpServer())
.post(`/api/apps/${application.id}/clone`)
.post('/api/v2/resources/clone')
.set('tj-workspace-id', adminUserData.user.defaultOrganizationId)
.set('Cookie', adminUserData['tokenCookie'])
.send({ name: 'App to clone_Copy' });
.send(payload);
expect(response.statusCode).toBe(201);
expect(response.body.success).toBe(true);
const appId = response.body.id;
const appId = response.body['imports']['app'][0]['id'];
const clonedApplication = await App.findOneOrFail({ where: { id: appId } });
expect(clonedApplication.name).toContain('App to clone');
response = await request(app.getHttpServer())
.post(`/api/apps/${application.id}/clone`)
.post('/api/v2/resources/clone')
.set('tj-workspace-id', developerUserData.user.defaultOrganizationId)
.set('Cookie', developerUserData['tokenCookie'])
.send({ name: 'App to clone_Copy' });
.send(payload);
expect(response.statusCode).toBe(403);
response = await request(app.getHttpServer())
.post(`/api/apps/${application.id}/clone`)
.post('/api/v2/resources/clone')
.set('tj-workspace-id', viewerUserData.user.defaultOrganizationId)
.set('Cookie', viewerUserData['tokenCookie'])
.send({ name: 'App to clone_Copy' });
.send(payload);
expect(response.statusCode).toBe(403);
@ -1325,16 +1331,16 @@ describe('apps controller', () => {
options: { method: 'get' },
});
const version4 = await request(app.getHttpServer())
.post(`/api/apps/${application.id}/versions`)
.set('tj-workspace-id', adminUserData.user.defaultOrganizationId)
.set('Cookie', adminUserData['tokenCookie'])
.send({
versionName: 'v4',
versionFromId: 'a77b051a-dd48-4633-a01f-089a845d5f88',
});
// const version4 = await request(app.getHttpServer())
// .post(`/api/apps/${application.id}/versions`)
// .set('tj-workspace-id', adminUserData.user.defaultOrganizationId)
// .set('Cookie', adminUserData['tokenCookie'])
// .send({
// versionName: 'v4',
// versionFromId: 'a77b051a-dd48-4633-a01f-089a845d5f88',
// });
expect(version4.statusCode).toBe(500);
// expect(version4.statusCode).toBe(500);
await logoutUser(app, adminUserData['tokenCookie'], adminUserData.user.defaultOrganizationId);
});

6
server/test/test.helper.ts
View file

@ -8,7 +8,7 @@ import { User } from 'src/entities/user.entity';
import { App } from 'src/entities/app.entity';
import { File } from 'src/entities/file.entity';
import { Plugin } from 'src/entities/plugin.entity';
import { INestApplication, ValidationPipe } from '@nestjs/common';
import { INestApplication, ValidationPipe, VersioningType, VERSION_NEUTRAL } from '@nestjs/common';
import { Test } from '@nestjs/testing';
import { AppModule } from 'src/app.module';
import { AppVersion } from 'src/entities/app_version.entity';
@ -51,6 +51,10 @@ export async function createNestAppInstance(): Promise<INestApplication> {
app.useGlobalFilters(new AllExceptionsFilter(moduleRef.get(Logger)));
app.useWebSocketAdapter(new WsAdapter(app));
app.useGlobalPipes(new ValidationPipe({ whitelist: true, transform: true }));
app.enableVersioning({
type: VersioningType.URI,
defaultVersion: VERSION_NEUTRAL,
});
await app.init();
return app;