From ed09e9c695109a715a4c8d47338bbb0b794eb009 Mon Sep 17 00:00:00 2001 From: OlegIvaniv Date: Tue, 25 Jul 2023 13:26:11 +0200 Subject: [PATCH] Revert "test(editor): Add canvas actions E2E tests" (#6736) Revert "test(editor): Add canvas actions E2E tests (#6723)" This reverts commit 052d82b2208c1b2e6f62c6004822c6278c15278b. --- cypress/e2e/12-canvas-actions.cy.ts | 36 ------------------- cypress/pages/workflow.ts | 3 -- cypress/support/commands.ts | 30 +++++----------- cypress/support/index.ts | 2 +- .../Node/NodeCreator/ItemTypes/NodeItem.vue | 4 --- 5 files changed, 10 insertions(+), 65 deletions(-) diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts index 3f23f90484..d336294f48 100644 --- a/cypress/e2e/12-canvas-actions.cy.ts +++ b/cypress/e2e/12-canvas-actions.cy.ts @@ -78,42 +78,6 @@ describe('Canvas Actions', () => { WorkflowPage.getters.nodeConnections().should('have.length', 1); }); - it('should add a connected node dragging from node creator', () => { - WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME); - cy.get('.plus-endpoint').should('be.visible').click(); - WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible'); - WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME); - cy.drag( - WorkflowPage.getters.nodeCreatorNodeItems().first(), - [100, 100], - { - realMouse: true, - abs: true - } - ); - cy.get('body').type('{esc}'); - WorkflowPage.getters.canvasNodes().should('have.length', 2); - WorkflowPage.getters.nodeConnections().should('have.length', 1); - }); - - it('should open a category when trying to drag and drop it on the canvas', () => { - WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME); - cy.get('.plus-endpoint').should('be.visible').click(); - WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible'); - WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME); - cy.drag( - WorkflowPage.getters.nodeCreatorActionItems().first(), - [100, 100], - { - realMouse: true, - abs: true - } - ); - WorkflowPage.getters.nodeCreatorCategoryItems().its('length').should('be.gt', 0); - WorkflowPage.getters.canvasNodes().should('have.length', 1); - WorkflowPage.getters.nodeConnections().should('have.length', 0); - }); - it('should add disconnected node if nothing is selected', () => { WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME); // Deselect nodes diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts index e269ce09fd..d324314dcc 100644 --- a/cypress/pages/workflow.ts +++ b/cypress/pages/workflow.ts @@ -96,9 +96,6 @@ export class WorkflowPage extends BasePage { nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'), nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'), nodeCreatorItems: () => cy.getByTestId('item-iterator-item'), - nodeCreatorNodeItems: () => cy.getByTestId('node-creator-node-item'), - nodeCreatorActionItems: () => cy.getByTestId('node-creator-action-item'), - nodeCreatorCategoryItems: () => cy.getByTestId('node-creator-category-item'), ndvParameters: () => cy.getByTestId('parameter-item'), nodeCredentialsLabel: () => cy.getByTestId('credentials-label'), getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) => diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 812404ff7a..6c7adaea8f 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -103,31 +103,19 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) => Cypress.Commands.add('drag', (selector, pos, options) => { const index = options?.index || 0; const [xDiff, yDiff] = pos; - const element = typeof selector === 'string' ? cy.get(selector).eq(index) : selector; + const element = cy.get(selector).eq(index); element.should('exist'); - element.then(([$el]) => { - const originalLocation = $el.getBoundingClientRect(); - const newPosition = { - x: options?.abs ? xDiff : originalLocation.x + xDiff, - y: options?.abs ? yDiff : originalLocation.y + yDiff, - } + const originalLocation = Cypress.$(selector)[index].getBoundingClientRect(); - if(options?.realMouse) { - element.realMouseDown(); - element.realMouseMove(newPosition.x, newPosition.y); - element.realMouseUp(); - } else { - element.trigger('mousedown', {force: true}); - element.trigger('mousemove', { - which: 1, - pageX: newPosition.x, - pageY: newPosition.y, - force: true, - }); - element.trigger('mouseup', {force: true}); - } + element.trigger('mousedown', { force: true }); + element.trigger('mousemove', { + which: 1, + pageX: options?.abs ? xDiff : originalLocation.right + xDiff, + pageY: options?.abs ? yDiff : originalLocation.top + yDiff, + force: true, }); + element.trigger('mouseup', { force: true }); }); Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => { diff --git a/cypress/support/index.ts b/cypress/support/index.ts index f1602b3e06..196a14d9ec 100644 --- a/cypress/support/index.ts +++ b/cypress/support/index.ts @@ -31,7 +31,7 @@ declare global { grantBrowserPermissions(...permissions: string[]): void; readClipboard(): Chainable; paste(pastePayload: string): void; - drag(selector: string | Cypress.Chainable>, target: [number, number], options?: {abs?: boolean, index?: number, realMouse?: boolean}): void; + drag(selector: string, target: [number, number], options?: {abs?: true, index?: number}): void; draganddrop(draggableSelector: string, droppableSelector: string): void; } } diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue index 8554a1a080..dd5a427f17 100644 --- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue +++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue @@ -9,7 +9,6 @@ :title="displayName" :show-action-arrow="showActionArrow" :is-trigger="isTrigger" - :data-test-id="dataTestId" >