Skip to content

Commit

Permalink
[3754] Activate cypress tests without useless ones
Browse files Browse the repository at this point in the history
Bug: #3754
Signed-off-by: Guillaume Coutable <[email protected]>
  • Loading branch information
gcoutable authored and sbegaudeau committed Sep 23, 2024
1 parent 62f7d7d commit b11e364
Show file tree
Hide file tree
Showing 69 changed files with 125 additions and 4,800 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ jobs:
working-directory: integration-tests

- name: Run end to end tests against the sirius-web application
if: false
uses: cypress-io/github-action@v5
with:
build: docker compose -f ../packages/sirius-web/backend/sirius-web/docker-compose.yml up -d
Expand All @@ -205,7 +204,6 @@ jobs:

- name: Store Cypress screenshots
uses: actions/upload-artifact@v4
if: false
with:
name: cypress-screenshots
path: integration-tests/target/screenshots/**/*.png
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ The new option ALWAYS allows the separator to be displayed in every case.
- https://github.com/eclipse-sirius/sirius-web/issues/4005[#4005] [diagram] Fix a problem synchronizing explorer with current selection
- https://github.com/eclipse-sirius/sirius-web/issues/4008[#4008] [diagram] Prevent `detailsEvent` to be triggered twice when selecting a multi-represented element in the diagram


=== New Features

- https://github.com/eclipse-sirius/sirius-web/issues/3763[#3763] [diagram] Make it possible to display semantic candidates in the selection dialog using a tree
Expand Down Expand Up @@ -76,6 +77,7 @@ never, always and if_children (to display the separator only if children exist).
- https://github.com/eclipse-sirius/sirius-web/issues/4021[#4021] [sirius-web] Disable the _Rename_ and _Delete_ project menu actions when project is read-only
- https://github.com/eclipse-sirius/sirius-web/issues/3677[#3677] [diagram] Remove backend layouting code from the time the backend was computing the layout.
- https://github.com/eclipse-sirius/sirius-web/issues/3678[#3678] [core] Rely on representation id to retrieve representation metadata
- https://github.com/eclipse-sirius/sirius-web/issues/3754[#3754] [sirius-web] Activate cypress tests again

== v2024.9.0

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"editor.formatOnSave": true,
"editor.formatOnPaste": false,
"editor.codeActionsOnSave": {
"source.organizeImports": "never"
"source.organizeImports": "explicit"
},
"[javascript]": {
"editor.formatOnSave": true
"editor.formatOnSave": true
},
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
2 changes: 1 addition & 1 deletion integration-tests/cypress/cypress.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ declare global {
getByTestId: (testId: string) => Chainable<JQuery<HTMLElement>>;
findByTestId: (testId: string) => Chainable<JQuery<HTMLElement>>;

createProject: (name: string) => Chainable<Response<MutationResponse<CreateProjectData>>>;
createProject: (name: string, natures: string[]) => Chainable<Response<MutationResponse<CreateProjectData>>>;
createProjectFromTemplate: (name: string) => Chainable<Response<MutationResponse<CreateProjectFromTemplateData>>>;
deleteProject: (projectId: string) => Chainable<Response<MutationResponse<DeleteProjectData>>>;

Expand Down
22 changes: 2 additions & 20 deletions integration-tests/cypress/e2e/new/project/new-project.cy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2021, 2023 Obeo.
* Copyright (c) 2021, 2024 Obeo.
* This program and the accompanying materials
* are made available under the erms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -18,18 +18,6 @@ describe('Project creation', () => {
beforeEach(() => new NewProject().visit());

context('When we manipulate the form', () => {
it('Then it contains all the expected fields', () => {
new NewProject()
.getNameField()
.should('have.attr', 'type', 'text')
.should('have.attr', 'name', 'name')
.should('have.attr', 'placeholder', 'Enter the project name');
});

it('The it focuses the name textfield automatically', () => {
cy.focused().should('have.attr', 'data-testid', 'name');
});

it('Then it requires a name', () => {
new NewProject().getCreateProjectButton().should('be.disabled');
});
Expand All @@ -53,16 +41,10 @@ describe('Project creation', () => {
});
});

it('Then it navigates to the edit project view on successful project creation with enter', () => {
new NewProject().getNameField().type('Cypress Project - New{enter}');

cy.url().should('match', new RegExp(Cypress.config().baseUrl + '/projects/[a-z0-9-]*/edit'));
});

it('Then it navigates to the edit project view on successful project creation by clicking on the create button', () => {
const newProject = new NewProject();
newProject.getNameField().type('Cypress Project - New');
newProject.getCreateProjectButton().click();
newProject.getCreateProjectButton().should('be.enabled').click();

cy.url().should('match', new RegExp(Cypress.config().baseUrl + '/projects/[a-z0-9-]*/edit'));
});
Expand Down
118 changes: 0 additions & 118 deletions integration-tests/cypress/e2e/project/deck/deck-card.cy.ts

This file was deleted.

117 changes: 0 additions & 117 deletions integration-tests/cypress/e2e/project/deck/deck-lane.cy.ts

This file was deleted.

Loading

0 comments on commit b11e364

Please sign in to comment.