Skip to content

Commit c73f4d6

Browse files
committed
test user management
1 parent 201f3be commit c73f4d6

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

.blueprint/github-build-matrix/generator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ export default class extends BaseGenerator {
4747
disabled: !generateBlueprint,
4848
},
4949
graalvm: {
50-
disabled: !graalvm,
50+
disabled: !(hasWorkflowChanges || java || graalvm || e2e),
5151
},
5252
};
5353
break;
5454
}
5555
case 'graalvm': {
56-
if (hasWorkflowChanges || java || graalvm) {
56+
if (hasWorkflowChanges || java || graalvm || e2e) {
5757
const { samples, warnings } = await getGithubSamplesGroup(this.templatePath('../samples/'), this.workflow);
5858
matrix = samples;
5959
if (warnings.length) {

generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
<%_
1717
1818
const customUserManagementPages = builtInUserManagement && userManagement.skipClient && userManagement.generateEntityCypress;
19-
const skipUserManagementCreatePage = builtInUserManagement && (!userManagement.skipClient || clientFrameworkReact);
19+
const skipUserManagementCreatePage = builtInUserManagement && !userManagement.skipClient;
2020
const baseApi = entityApi + 'api/';
2121
2222
const entityFakeData = generateFakeData('cypress');
@@ -26,15 +26,14 @@ const otherEntities = this._.uniq(Object.values(differentRelationships).filter(r
2626
// We cannot generate a required entity with relationship with required relationships.
2727
const skipCreateTest =
2828
(
29-
graalvmSupport ||
3029
!cypressBootstrapEntities ||
3130
requiredRelationships.some(rel => rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.derived) ||
3231
requiredRelationships.some(rel => rel.otherEntity.builtInUser || rel.otherEntity === this.entity) ||
3332
requiredRelationships.map(rel => rel.otherEntity.relationships).flat().some(rel => rel.relationshipRequired) ||
3433
!entityFakeData
3534
) ? '.skip' : '';
3635
37-
const reason = graalvmSupport ? 'graalvm is failing.' : 'cannot create a required entity with relationship with required relationships.';
36+
const reason = 'cannot create a required entity with relationship with required relationships.';
3837
3938
const sampleFields = fields.filter(f => !f.autoGenerate && !f.nullable);
4039

0 commit comments

Comments
 (0)