diff --git a/cypress/integration/other/interaction.spec.js b/cypress/integration/other/interaction.spec.js index 6d37af273..d3e6a73b7 100644 --- a/cypress/integration/other/interaction.spec.js +++ b/cypress/integration/other/interaction.spec.js @@ -70,7 +70,7 @@ describe('Interaction', () => { expect(location.href).to.eq('http://localhost:9000/webpackUsage.html'); }); }); - it('should handle a click on a task with a bound function', () => { + it('should handle a click on a task with a bound function without args', () => { const url = 'http://localhost:9000/click_security_loose.html'; cy.viewport(1440, 1024); cy.visit(url); @@ -78,9 +78,20 @@ describe('Interaction', () => { .find('rect#cl2') .click({ force: true }); - cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant cl2'); }); - it('should handle a click on a task with a bound function', () => { + it('should handle a click on a task with a bound function with args', () => { + const url = 'http://localhost:9000/click_security_loose.html'; + cy.viewport(1440, 1024); + cy.visit(url); + cy.get('body') + .find('rect#cl3') + .click({ force: true }); + + cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant test1 test2 test3'); + }); + + it('should handle a click on a task with a bound function without args', () => { const url = 'http://localhost:9000/click_security_loose.html'; cy.viewport(1440, 1024); cy.visit(url); @@ -88,8 +99,19 @@ describe('Interaction', () => { .find('text#cl2-text') .click({ force: true }); - cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant cl2'); }); + it('should handle a click on a task with a bound function with args ', () => { + const url = 'http://localhost:9000/click_security_loose.html'; + cy.viewport(1440, 1024); + cy.visit(url); + cy.get('body') + .find('text#cl3-text') + .click({ force: true }); + + cy.get('.created-by-gant-click').should('have.text', 'Clicked By Gant test1 test2 test3'); + }); + }); describe('Interaction - security level tight', () => { @@ -170,7 +192,7 @@ describe('Interaction', () => { .find('rect#cl2') .click({ force: true }); - cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant cl2'); }); it('should handle a click on a task with a bound function', () => { const url = 'http://localhost:9000/click_security_strict.html'; @@ -180,7 +202,7 @@ describe('Interaction', () => { .find('text#cl2-text') .click({ force: true }); - cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant cl2'); }); }); @@ -226,7 +248,7 @@ describe('Interaction', () => { .find('rect#cl2') .click({ force: true }); - cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant cl2'); }); it('should handle a click on a task with a bound function', () => { const url = 'http://localhost:9000/click_security_strict.html'; @@ -236,7 +258,7 @@ describe('Interaction', () => { .find('text#cl2-text') .click({ force: true }); - cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant'); + cy.get('.created-by-gant-click').should('not.have.text', 'Clicked By Gant cl2'); }); }); }); diff --git a/cypress/platform/click_security_loose.html b/cypress/platform/click_security_loose.html index 58715fa39..39d3e85ef 100644 --- a/cypress/platform/click_security_loose.html +++ b/cypress/platform/click_security_loose.html @@ -49,9 +49,11 @@ section Clickable Visit mermaidjs :active, cl1, 2014-01-07,2014-01-10 Calling a Callback (look at the console log) :cl2, after cl1, 3d + Calling a Callback with args :cl3, after cl1, 3d click cl1 href "http://localhost:9000/webpackUsage.html" - click cl2 call clickByGantt("test", test, test) + click cl2 call clickByGantt() + click cl3 call clickByGantt("test1", test2, test3) section Last section Describe gantt syntax :after doc1, 3d @@ -69,11 +71,14 @@ document.getElementsByTagName('body')[0].appendChild(div) } - function clickByGantt(elemName) { + function clickByGantt(arg1, arg2, arg3) { const div = document.createElement('div') div.className = 'created-by-gant-click' div.style = 'padding: 20px; background: green; color: white;' div.innerText = 'Clicked By Gant' + if (arg1) div.innerText += ' ' + arg1; + if (arg2) div.innerText += ' ' + arg2; + if (arg3) div.innerText += ' ' + arg3; document.getElementsByTagName('body')[0].appendChild(div) } diff --git a/cypress/platform/click_security_strict.html b/cypress/platform/click_security_strict.html index 24267a295..f030caf6b 100644 --- a/cypress/platform/click_security_strict.html +++ b/cypress/platform/click_security_strict.html @@ -49,9 +49,11 @@ section Clickable Visit mermaidjs :active, cl1, 2014-01-07,2014-01-10 Calling a Callback (look at the console log) :cl2, after cl1, 3d + Calling a Callback with args :cl3, after cl1, 3d click cl1 href "http://localhost:9000/webpackUsage.html" - click cl2 call clickByGantt("test", test, test) + click cl2 call clickByGantt() + click cl3 call clickByGantt("test1", test2, test3) section Last section Describe gantt syntax :after doc1, 3d @@ -69,11 +71,14 @@ document.getElementsByTagName('body')[0].appendChild(div) } - function clickByGantt(elemName) { + function clickByGantt(arg1, arg2, arg3) { const div = document.createElement('div') div.className = 'created-by-gant-click' div.style = 'padding: 20px; background: green; color: white;' div.innerText = 'Clicked By Gant' + if (arg1) div.innerText += ' ' + arg1; + if (arg2) div.innerText += ' ' + arg2; + if (arg3) div.innerText += ' ' + arg3; document.getElementsByTagName('body')[0].appendChild(div) }