Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const sysMLViewFrameNodeStyle = (
hovered: boolean,
faded: boolean
): React.CSSProperties => {
const packageContainerStyle: React.CSSProperties = {
const frameContainerStyle: React.CSSProperties = {
display: 'flex',
padding: '0px',
width: '100%',
Expand All @@ -49,10 +49,10 @@ const sysMLViewFrameNodeStyle = (
};

if (selected || hovered) {
packageContainerStyle.outline = `${theme.palette.selected} solid 1px`;
frameContainerStyle.outline = `${theme.palette.selected} solid 1px`;
}

return packageContainerStyle;
return frameContainerStyle;
};

const viewFrameNameCompartmentStyle = (
Expand All @@ -63,8 +63,8 @@ const viewFrameNameCompartmentStyle = (
return {
display: 'flex',
position: 'absolute',
top: 0,
left: 0,
top: -1,
left: -1,
width: '70%',
padding: '4px 8px',
opacity: faded ? '0.4' : '',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -87,7 +87,7 @@ describe('Semantic Element Creation Tests', () => {
);
});

context('When we select the Libraries directory in the explorer', () => {
context('When we select the Libraries directory in the explorer', { retries: 3 }, () => {
it('Then we cannot create a new object in it', () => {
const explorer = new Explorer();
explorer.getTreeItemByLabel(sysmlv2.getLibrariesLabel()).first().find('button').click();
Expand Down
12 changes: 8 additions & 4 deletions integration-tests-cypress/cypress/usecases/Batmobile.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -16,12 +16,16 @@ import { CreatedProjectData } from './Batmobile.types';

export class Batmobile {
public createBatmobileProject(): Cypress.Chainable<CreatedProjectData> {
return cy.createProject('Batmobile', 'batmobile-template').then((res) => {
return cy.createProject('Batmobile', 'batmobile-template', []).then((res) => {
if (!res?.body?.data?.createProject) {
throw new Error(
'The project Batmobile has not been created: createProject did not return an HTTP response payload'
);
}
const payload = res.body.data.createProject;
if (isCreateProjectSuccessPayload(payload)) {
const projectId = payload.project.id;
const data: CreatedProjectData = { projectId };
return cy.wrap(data);
return { projectId };
} else {
throw new Error(`The project Batmobile has not been created`);
}
Expand Down
12 changes: 8 additions & 4 deletions integration-tests-cypress/cypress/usecases/SysMLv2.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2024, 2025 Obeo.
* Copyright (c) 2024, 2026 Obeo.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -16,12 +16,16 @@ import { CreatedProjectData } from './SysMLv2.types';

export class SysMLv2 {
public createSysMLv2Project(): Cypress.Chainable<CreatedProjectData> {
return cy.createProject('SysMLv2', 'sysmlv2-template').then((res) => {
return cy.createProject('SysMLv2', 'sysmlv2-template', []).then((res) => {
if (!res?.body?.data?.createProject) {
throw new Error(
'The project SysMLv2 has not been created: createProject did not return an HTTP response payload'
);
}
const payload = res.body.data.createProject;
if (isCreateProjectSuccessPayload(payload)) {
const projectId = payload.project.id;
const data: CreatedProjectData = { projectId };
return cy.wrap(data);
return { projectId };
} else {
throw new Error(`The project SysMLv2 has not been created`);
}
Expand Down
Loading