Merge branch 'master' into PAY-1377-send-user-id-on-setup

* master: (63 commits) fix(editor): Fix various typecheck issues (no-changelog) (#8739) feat: SQL agent improvements (#8709) fix(Postgres Trigger Node): `closeFunction` errors should not prevent a workflow from being deactivated (#8738) feat: Add support for Ollama embeddings API (#8732) fix(editor): Remove NDVSubConnections component console.log (no-changelog) (#8737) fix(editor): Hide previous execution data for sub-nodes in debug mode if it has execution error (#8710) feat: Add env variables to support exposing `/workflows/demo` route and `/nodes.json` route (#8506) refactor(core): Update auth related typings (no-changelog) (#8686) docs: Update docker-compose.yml example to Postgres 16 and update initialization script (#8486) fix(editor): Update Filter component state when value is updated (#8684) feat(editor): AI Floating Nodes (#8703) fix(core): Fix pairedItem issue with partial manual executions (#8575) fix: Fix execution error when using AI chain nodes with non-chat model (#8724) feat(AI Agent Node): Allow use of Azure Chat model for OpenAI Functions agent (#8725) ci: Upgrade `ip` to address CVE-2023-42282 (no-changelog) (#8704) fix(core): Ensure `maxRedirects` is used for any http request defining it (#8706) fix(Trello Node): Remove GET request body (#8715) fix(editor): Do not break NDV for version-less nodes (#8714) feat(editor): Retrieve previous chat message on arrow-up (#8696) fix(Default Data Loader Node): Fix binary data loader in s3 mode (#8626) ...
n8n-io · Feb 26, 2024 · 5f88a18 · 5f88a18
2 parents 4258619 + c0be43b
commit 5f88a18
Show file tree

Hide file tree

Showing 228 changed files with 5,079 additions and 2,911 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,81 @@
+# [1.30.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.30.0) (2024-02-21)
+
+
+### Bug Fixes
+
+* **AwsS3 Node:** Use location constrain ([#8654](https://github.com/n8n-io/n8n/issues/8654)) ([c73aeee](https://github.com/n8n-io/n8n/commit/c73aeeec3d296b3a6e203eba4513f6bd4bb65732))
+* **core:** Apply correct hostname to redirected requests ([#8674](https://github.com/n8n-io/n8n/issues/8674)) ([0e36aeb](https://github.com/n8n-io/n8n/commit/0e36aeb421997948ef5d5170fa8d9b50d25b852d))
+* **core:** Define `SHELL` env variable on docker images ([#8670](https://github.com/n8n-io/n8n/issues/8670)) ([e1a4fde](https://github.com/n8n-io/n8n/commit/e1a4fde207e392c372e3876946d6a5740721e253))
+* **editor:** Correctly set condition operator when changed ([#8700](https://github.com/n8n-io/n8n/issues/8700)) ([23a1bc4](https://github.com/n8n-io/n8n/commit/23a1bc40a2eb8d340eea635a48c75f59369095bb))
+* **editor:** Escape node names with quotes in autocomplete and drag'n'drop ([#8663](https://github.com/n8n-io/n8n/issues/8663)) ([890c2bd](https://github.com/n8n-io/n8n/commit/890c2bd52bd2ccd94fbc2e626dceda30554f9e82))
+* **editor:** Filter component: do not clear expression when changing operator ([#8635](https://github.com/n8n-io/n8n/issues/8635)) ([66cbe54](https://github.com/n8n-io/n8n/commit/66cbe54e1d0ec48a36e6b6b15aaf7201970932e7))
+* **editor:** Fix node runData and pinned data check on manual run ([#8669](https://github.com/n8n-io/n8n/issues/8669)) ([40c7f77](https://github.com/n8n-io/n8n/commit/40c7f77a35ef4e9bd4dbd9f28886b1b9e6af416f))
+* **editor:** Fix SQL editors not always re-rendering when query changes ([#8621](https://github.com/n8n-io/n8n/issues/8621)) ([8e9d310](https://github.com/n8n-io/n8n/commit/8e9d3106a5792a182753e4030c135893f8bad27e))
+* **editor:** Fix unnecessary execution of nodes when there is pin data ([#8567](https://github.com/n8n-io/n8n/issues/8567)) ([46fe544](https://github.com/n8n-io/n8n/commit/46fe544b9a38ea81093d846917af970141b8c86a))
+* **editor:** Handle drag-n-dropping from other nodes in assignment component ([#8661](https://github.com/n8n-io/n8n/issues/8661)) ([c943a51](https://github.com/n8n-io/n8n/commit/c943a51a28953c2ecd0f3ae4849fd8a0de187bfc))
+* **editor:** Send protocol and n8n version in templates destination parameter, stop redirecting template preview page to website ([#8691](https://github.com/n8n-io/n8n/issues/8691)) ([a573146](https://github.com/n8n-io/n8n/commit/a57314613586841c14e86f009bf42793545c33f8))
+* **editor:** Use proper composable for localization ([#8660](https://github.com/n8n-io/n8n/issues/8660)) ([9c0fe41](https://github.com/n8n-io/n8n/commit/9c0fe413d9beb669b8b9807f98569f46a1682855))
+* **editor:** Wrap expressions in resource locator component ([#8673](https://github.com/n8n-io/n8n/issues/8673)) ([e2f2fc9](https://github.com/n8n-io/n8n/commit/e2f2fc910df5ee06fa0b57b85689b5674b6774ba))
+* **Extract From File Node:** Make binary data work with any backend  ([#8647](https://github.com/n8n-io/n8n/issues/8647)) ([d33d953](https://github.com/n8n-io/n8n/commit/d33d953497d25a50f17c71f7ecc7b9cc6332816e))
+* **FTP Node:** Continue of fail looping support with paired item ([#8659](https://github.com/n8n-io/n8n/issues/8659)) ([3279762](https://github.com/n8n-io/n8n/commit/327976222114956584fdb2de51c914ad57382988))
+* **FTP Node:** Fix "Maximum call stack size exceeded" error when dealing with too many files ([#8657](https://github.com/n8n-io/n8n/issues/8657)) ([5063674](https://github.com/n8n-io/n8n/commit/506367453c46485e5baff6510ce0c653ca4cc4e4))
+* **Google Calendar Node:** Errors with after/before options ([#8628](https://github.com/n8n-io/n8n/issues/8628)) ([bee17dd](https://github.com/n8n-io/n8n/commit/bee17dd6cc4eaabc252602a02d4ec109f42ef926))
+* **GraphQL Node:** Fix request format JSON error ([#8646](https://github.com/n8n-io/n8n/issues/8646)) ([bd4b50c](https://github.com/n8n-io/n8n/commit/bd4b50cf0882553b2ecb7f0b9bd93d154f775b4f))
+* **Postgres Node:** Close connection pool only if it's not already closed or closing ([#8690](https://github.com/n8n-io/n8n/issues/8690)) ([457cac4](https://github.com/n8n-io/n8n/commit/457cac4cf9f7093d48e9f4ccb0021423c18f0b8b))
+
+
+### Features
+
+* **AI Agent Node:** Whitelist Azure Chat model for Agent ([#8699](https://github.com/n8n-io/n8n/issues/8699)) ([40aecd1](https://github.com/n8n-io/n8n/commit/40aecd1715d4fec7e5024167e89d4b2171ec19e8))
+* **core:** Add support for $("NodeName").isExecuted ([#8683](https://github.com/n8n-io/n8n/issues/8683)) ([ad82f0c](https://github.com/n8n-io/n8n/commit/ad82f0c0c827e535a22b0a51e408f4cddea280e0))
+* **core:** Move execution permission checks earlier in the lifecycle ([#8677](https://github.com/n8n-io/n8n/issues/8677)) ([059d281](https://github.com/n8n-io/n8n/commit/059d281fd1efdd281d3c9bf3f3a6c614d343e7ca))
+* **editor:** Add chevron to filter component operator select ([#8633](https://github.com/n8n-io/n8n/issues/8633)) ([20446bd](https://github.com/n8n-io/n8n/commit/20446bdf11bd9f3528fd7b3bad61d522f1102f4d))
+* **Google Sheets Node:** Option how to combine filters when reading rows ([#8652](https://github.com/n8n-io/n8n/issues/8652)) ([a5e522e](https://github.com/n8n-io/n8n/commit/a5e522e5360bd72a5567c96aaf0076baf0d95b35))
+* **Google Workspace Admin Node:** Add support for error output branch ([#8499](https://github.com/n8n-io/n8n/issues/8499)) ([ef77571](https://github.com/n8n-io/n8n/commit/ef775711d01e77533775bd3c1e1f9bb1c508f2b2))
+* Introduce prompt type option for Agent, Basic LLM Chain, and QA Chain nodes ([#8697](https://github.com/n8n-io/n8n/issues/8697)) ([2068f18](https://github.com/n8n-io/n8n/commit/2068f186ffd64766051294e8652689618a0df3fb))
+
+
+
+# [1.29.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.29.0) (2024-02-15)
+
+
+### Bug Fixes
+
+* **core:** Custom workflow tool tweaks  ([#8561](https://github.com/n8n-io/n8n/issues/8561)) ([ccc0ad5](https://github.com/n8n-io/n8n/commit/ccc0ad5009b2d547accfc34a9c0917114fd19c81))
+* **core:** Give better error message if `executions.process` is still used in the configs ([#8618](https://github.com/n8n-io/n8n/issues/8618)) ([cd8ca84](https://github.com/n8n-io/n8n/commit/cd8ca8412d02090af07d8657283b7637178c975c))
+* **core:** Improve the startup error when EXECUTIONS_PROCESS is set ([#8630](https://github.com/n8n-io/n8n/issues/8630)) ([a2a3ca1](https://github.com/n8n-io/n8n/commit/a2a3ca160f253b3b09f83bdc6dec11987971e464))
+* **core:** Upgrade `@n8n/typeorm` to address postgres timestamp issues ([#8627](https://github.com/n8n-io/n8n/issues/8627)) ([68498cb](https://github.com/n8n-io/n8n/commit/68498cb72a16d587c4b24f9fe5e8ac2450cd78b9))
+* **core:** Upgrade rudderstack sdk to address npm postInstall issues ([#8568](https://github.com/n8n-io/n8n/issues/8568)) ([5750e8e](https://github.com/n8n-io/n8n/commit/5750e8e88ed59b40d5115416c8afe227cb64c70e))
+* **editor:** Debounce expression changes ([#8629](https://github.com/n8n-io/n8n/issues/8629)) ([9c7e026](https://github.com/n8n-io/n8n/commit/9c7e0266ee1c2112649772ca553bff429dcabc2d))
+* **Execute Workflow Node:** Passing the workflow that is supposed to be executed as a paramter ([#8614](https://github.com/n8n-io/n8n/issues/8614)) ([b54488a](https://github.com/n8n-io/n8n/commit/b54488ada53a9941f5fd4d3cab8d39bd81b22f4a))
+* Fix resolving of expressions of deeply nested sub-nodes ([#8612](https://github.com/n8n-io/n8n/issues/8612)) ([f527430](https://github.com/n8n-io/n8n/commit/f5274302f843c34f0a8a0b3eb51e7f9262fe0ea4))
+* **FTP Node:** Fix issue with connections not closing properly ([#8619](https://github.com/n8n-io/n8n/issues/8619)) ([e597fbc](https://github.com/n8n-io/n8n/commit/e597fbc78ff60ce495eecd9ffdffda801ed90b66))
+* **FTP Node:** Fix issue with paireditems not always working ([#8613](https://github.com/n8n-io/n8n/issues/8613)) ([d38a822](https://github.com/n8n-io/n8n/commit/d38a822b9501a8730c9cf097a9372e96080e8722))
+* **Google Sheets Trigger Node:** First non-header row is ignored when using on row added event ([#8580](https://github.com/n8n-io/n8n/issues/8580)) ([2db8231](https://github.com/n8n-io/n8n/commit/2db8231af5baed941b5250af373898c3924d3baa))
+* **HTTP Request Node:** Errorneous binary object without content-disposition response header ([#8583](https://github.com/n8n-io/n8n/issues/8583)) ([e28b374](https://github.com/n8n-io/n8n/commit/e28b374170725efeff59ac39e4ba6385bf834e7f))
+* **HTTP Request Node:** Handle special characters in pagination expressions + improve hint text ([#8576](https://github.com/n8n-io/n8n/issues/8576)) ([3b2078c](https://github.com/n8n-io/n8n/commit/3b2078c3caf2a5acee48fed3055b47dbfe0af44a))
+* **Jira Software Node:** Fix issue with not all issue types being supported ([#8571](https://github.com/n8n-io/n8n/issues/8571)) ([a6211c9](https://github.com/n8n-io/n8n/commit/a6211c9a5df9513ef057be1bfb78b4e0e2a75c2f))
+* **Merge Node:** Fixing how paired items are handled in the merge node, when choosing a branch and selecting to return an empty object ([#8479](https://github.com/n8n-io/n8n/issues/8479)) ([a3bed97](https://github.com/n8n-io/n8n/commit/a3bed97883ece25ffb4ab3a8246418b123c92e52))
+* **Microsoft Outlook Node:** Download executes more than once per incoming item ([#8566](https://github.com/n8n-io/n8n/issues/8566)) ([053fb5f](https://github.com/n8n-io/n8n/commit/053fb5ff7a3a4ce30b35fa6c830787b935ebaf63))
+* **Notion Node:** Block with text results in a body validation error ([#8622](https://github.com/n8n-io/n8n/issues/8622)) ([6bc1c3d](https://github.com/n8n-io/n8n/commit/6bc1c3d7a83436ee3b3520adf4b52f59f2b4231c))
+* **RSS Feed Trigger Node:** Save last item's date instead of last execution date ([#8572](https://github.com/n8n-io/n8n/issues/8572)) ([a822588](https://github.com/n8n-io/n8n/commit/a822588012b66711f37d3ca363fcd04742eda1b8))
+* **Wait Node:** Account for workflow timezone in Wait node datetime ([#8578](https://github.com/n8n-io/n8n/issues/8578)) ([1116a28](https://github.com/n8n-io/n8n/commit/1116a28b4582cae93e9d44890cfe020cd813521c))
+
+
+### Features
+
+* Add support for AI log streaming ([#8526](https://github.com/n8n-io/n8n/issues/8526)) ([7501ad8](https://github.com/n8n-io/n8n/commit/7501ad8f3c56d9fcc5f4ec3d6fc468ab9cdb5024))
+* Add telemetry event when users click on templates link ([#8625](https://github.com/n8n-io/n8n/issues/8625)) ([bf4f896](https://github.com/n8n-io/n8n/commit/bf4f896373acb2530a8f322cd612a3de616d6d15))
+* **API:** Add tag support to public API ([#8588](https://github.com/n8n-io/n8n/issues/8588)) ([a743a40](https://github.com/n8n-io/n8n/commit/a743a4037674ccb68a311daa5511cb48de6c9bfa))
+* **Convert to File Node:** Operation to convert a string in a plain text file, option to format JSON when creating file ([#8620](https://github.com/n8n-io/n8n/issues/8620)) ([d18cba3](https://github.com/n8n-io/n8n/commit/d18cba37a4a690cb3b4cd4259d27aedaa97193e4))
+* **core:** Migrate to n8n's typeorm fork ([#8590](https://github.com/n8n-io/n8n/issues/8590)) ([8e392cf](https://github.com/n8n-io/n8n/commit/8e392cfc1dd103a00b3a0e7c186cbfad989a5080))
+* **editor:** Use website as the main templates repository ([#8591](https://github.com/n8n-io/n8n/issues/8591)) ([79b09fd](https://github.com/n8n-io/n8n/commit/79b09fdf84860eee4c80e0c7eb7e320f6e05eabb))
+* **HTML Extract Node:** Better text extraction, option to specify selectors to skip, option to clean up text data ([#8586](https://github.com/n8n-io/n8n/issues/8586)) ([32281d1](https://github.com/n8n-io/n8n/commit/32281d12d775281e4b8e419d76e46ca9e3b47267))
+* **OpenAI Node:** Overhaul ([#8335](https://github.com/n8n-io/n8n/issues/8335)) ([941278d](https://github.com/n8n-io/n8n/commit/941278db6880ae3734a7a37aa03d7e6106ee5009))
+* Upgrade typeorm, sqlite3, and pg/pg-promise ([#8579](https://github.com/n8n-io/n8n/issues/8579)) ([7826bd8](https://github.com/n8n-io/n8n/commit/7826bd842a8e1548c1eab8fff942d2efe8b3dc75))
+
+
+
 # [1.28.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.28.0) (2024-02-07)
 
 

diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
@@ -2,6 +2,8 @@
  * Getters
  */
 
+import { getVisibleSelect } from "../utils";
+
 export function getCredentialSelect(eq = 0) {
 	return cy.getByTestId('node-credentials-select').eq(eq);
 }
@@ -71,3 +73,12 @@ export function clickExecuteNode() {
 export function setParameterInputByName(name: string, value: string) {
 	getParameterInputByName(name).clear().type(value);
 }
+
+export function toggleParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').realClick()
+}
+
+export function setParameterSelectByContent(name: string, content: string) {
+	getParameterInputByName(name).realClick();
+	getVisibleSelect().find('.option-headline').contains(content).click();
+}
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
@@ -132,7 +132,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 			.logo()
 			.should('have.attr', 'src')
 			.then((src) => {
-				expect(src).to.include('/n8n-dev-logo-dark-mode.svg');
+				expect(src).to.include('/static/logo/channel/dev-dark.svg');
 			});
 
 		cy.visit(personalSettingsPage.url);
@@ -143,7 +143,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 			.logo()
 			.should('have.attr', 'src')
 			.then((src) => {
-				expect(src).to.include('/n8n-dev-logo.svg');
+				expect(src).to.include('/static/logo/channel/dev.svg');
 			});
 	});
 

diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
@@ -489,4 +489,107 @@ describe('Execution', () => {
 				.should('have.class', 'has-run');
 		});
 	});
+
+	it('should send proper payload for node rerun', () => {
+		cy.createFixtureWorkflow(
+			'Multiple_trigger_node_rerun.json',
+			`Multiple trigger node rerun ${uuid()}`,
+		);
+
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('do something with them')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).to.have.property('runData').that.is.an('object');
+			const expectedKeys = ['When clicking "Test workflow"', 'fetch 5 random users'];
+
+			expect(Object.keys(interception.request.body.runData)).to.have.lengthOf(expectedKeys.length);
+			expect(interception.request.body.runData).to.include.all.keys(expectedKeys);
+		});
+	});
+
+	it('should send proper payload for manual node run', () => {
+		cy.createFixtureWorkflow(
+			'Check_manual_node_run_for_pinned_and_rundata.json',
+			`Check manual node run for pinned and rundata ${uuid()}`,
+		);
+
+		workflowPage.getters.zoomToFitButton().click();
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('If')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).not.to.have.property('runData').that.is.an('object');
+			expect(interception.request.body).to.have.property('pinData').that.is.an('object');
+			const expectedPinnedDataKeys = ['Webhook'];
+
+			expect(Object.keys(interception.request.body.pinData)).to.have.lengthOf(
+				expectedPinnedDataKeys.length,
+			);
+			expect(interception.request.body.pinData).to.include.all.keys(expectedPinnedDataKeys);
+		});
+
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters
+			.canvasNodeByName('NoOp2')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		cy.wait('@workflowRun').then((interception) => {
+			expect(interception.request.body).to.have.property('runData').that.is.an('object');
+			expect(interception.request.body).to.have.property('pinData').that.is.an('object');
+			const expectedPinnedDataKeys = ['Webhook'];
+			const expectedRunDataKeys = ['If', 'Webhook'];
+
+			expect(Object.keys(interception.request.body.pinData)).to.have.lengthOf(
+				expectedPinnedDataKeys.length,
+			);
+			expect(interception.request.body.pinData).to.include.all.keys(expectedPinnedDataKeys);
+
+			expect(Object.keys(interception.request.body.runData)).to.have.lengthOf(
+				expectedRunDataKeys.length,
+			);
+			expect(interception.request.body.runData).to.include.all.keys(expectedRunDataKeys);
+		});
+	});
+
+	it('should successfully execute partial executions with nodes attached to the second output', () => {
+		cy.createFixtureWorkflow(
+			'Test_Workflow_pairedItem_incomplete_manual_bug.json',
+			'My test workflow',
+		);
+
+		cy.intercept('POST', '/rest/workflows/run').as('workflowRun');
+
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+		workflowPage.getters
+			.canvasNodeByName('Test Expression')
+			.findChildByTestId('execute-node-button')
+			.click({ force: true });
+
+		// Check  toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		// Wait for the execution to return.
+		cy.wait('@workflowRun');
+		// Wait again for the websocket message to arrive and the UI to update.
+		cy.wait(100);
+		workflowPage.getters.errorToast({ timeout: 1 }).should('not.exist');
+	});
 });
diff --git a/cypress/e2e/29-sql-editor.cy.ts b/cypress/e2e/29-sql-editor.cy.ts
@@ -27,6 +27,26 @@ describe('SQL editors', () => {
 		ndv.getters.sqlEditorContainer().should('contain', 'SELECT * FROM `testTable` LIMIT 10');
 	});
 
+	it('should update expression output dropdown as the query is edited', () => {
+		workflowPage.actions.addInitialNodeToCanvas('MySQL', {
+			action: 'Execute a SQL query',
+		});
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('When clicking "Test workflow"');
+		ndv.actions.setPinnedData([{ table: 'test_table' }]);
+		ndv.actions.close();
+
+		workflowPage.actions.openNode('MySQL');
+		ndv.getters
+			.sqlEditorContainer()
+			.find('.cm-content')
+			.type('SELECT * FROM {{ $json.table }}', { parseSpecialCharSequences: false });
+		workflowPage.getters
+			.inlineExpressionEditorOutput()
+			.should('have.text', 'SELECT * FROM test_table');
+	});
+
 	it('should not push NDV header out with a lot of code in Postgres editor', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Postgres', {
 			action: 'Execute a SQL query',

diff --git a/cypress/e2e/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
@@ -25,6 +25,13 @@ describe('Workflow templates', () => {
 		mainSidebar.getters.menuItem('Templates').should('be.visible');
 		// Templates should be a link to the website
 		mainSidebar.getters.templates().parent('a').should('have.attr', 'href').and('include', 'https://n8n.io/workflows');
+		// Link should contain instance address and n8n version
+		mainSidebar.getters.templates().parent('a').then(($a) => {
+			const href = $a.attr('href');
+			// Link should have current instance address and n8n version
+			expect(href).to.include(`utm_instance=${window.location.origin}`);
+			expect(href).to.match(/utm_n8n_version=[0-9]+\.[0-9]+\.[0-9]+/);
+		});
 		mainSidebar.getters.templates().parent('a').should('have.attr', 'target', '_blank');
 	});
 
@@ -34,11 +41,4 @@ describe('Workflow templates', () => {
 			cy.url().should('include', 'https://n8n.io/workflows');
 		})
 	});
-
-	it('Redirects to website when visiting template by id page directly', () => {
-		cy.visit(`${templatesPage.url}/1`);
-		cy.origin('https://n8n.io', () => {
-			cy.url().should('include', 'https://n8n.io/workflows/1');
-		})
-	});
 });