Revert "test(editor): Add canvas actions E2E tests" (#6736)

Revert "test(editor): Add canvas actions E2E tests (#6723)" This reverts commit 052d82b.
n8n-io · Aug 3, 2023 · c2d00b4 · c2d00b4
1 parent 1198d8b
commit c2d00b4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 66 deletions.
diff --git 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
@@ -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
@@ -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,
-		}
-
-		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});
-		}
+	const originalLocation = Cypress.$(selector)[index].getBoundingClientRect();
+
+	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
@@ -31,7 +31,7 @@ declare global {
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string | Cypress.Chainable<JQuery<HTMLElement>>, 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
@@ -9,7 +9,6 @@
 		:title="displayName"
 		:show-action-arrow="showActionArrow"
 		:is-trigger="isTrigger"
-		:data-test-id="dataTestId"
 	>
 		<template #icon>
 			<node-icon :nodeType="nodeType" />
@@ -75,9 +74,6 @@ const description = computed<string>(() => {
 	}) as string;
 });
 const showActionArrow = computed(() => hasActions.value);
-const dataTestId = computed(() =>
-	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
-);
 
 const hasActions = computed(() => {
 	return nodeActions.value.length > 1;