Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make prettier checks .js in root and cypress folder #5260

Merged
merged 5 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions addon-registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,14 @@ function getAddonsLoaderChain(graph) {
*/
class AddonConfigurationRegistry {
constructor(projectRootPath) {
const packageJson = (this.packageJson = require(path.join(
projectRootPath,
'package.json',
)));
const packageJson = (this.packageJson = require(
path.join(projectRootPath, 'package.json'),
));
// Loads the dynamic config, if any
if (fs.existsSync(path.join(projectRootPath, 'volto.config.js'))) {
this.voltoConfigJS = require(path.join(
projectRootPath,
'volto.config.js',
));
this.voltoConfigJS = require(
path.join(projectRootPath, 'volto.config.js'),
);
} else {
this.voltoConfigJS = [];
}
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"name": "Using fixtures to represent data",
"email": "hello@cypress.io",
"body": "Fixtures are a great way to mock data for responses to routes"
}
}
3 changes: 1 addition & 2 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ Cypress.Commands.add(
body: bodyModifier({
...defaultParams.body,
image: {
data:
'iVBORw0KGgoAAAANSUhEUgAAANcAAAA4CAMAAABZsZ3QAAAAM1BMVEX29fK42OU+oMvn7u9drtIPisHI4OhstdWZyt4fkcXX5+sAg74umMhNp86p0eJ7vNiKw9v/UV4wAAAAAXRSTlMAQObYZgAABBxJREFUeF7tmuty4yAMhZG4X2zn/Z92J5tsBJwWXG/i3XR6frW2Y/SBLIRAfaQUDNt8E5tLUt9BycfcKfq3R6Mlfyimtx4rzp+K3dtibXkor99zsEqLYZltblTecciogoh+TXfY1Ve4dn07rCDGG9dHSEEOg/GmXl0U1XDxTKxNK5De7BxsyyBr6gGm2/vPxKJ8F6f7BXKfRMp1xIWK9A+5ks25alSb353dWnDJN1k35EL5f8dVGifTf/4tjUuuFq7u4srmXC60yAmldLXIWbg65RKU87lcGxJCFqUPv0IacW0PmSivOZFLE908inPToMmii/roG+MRV/O8FU88i8tFsxV3a06MFUw0Qu7RmAtdV5/HVVaOVMTWNOWSwMljLhzhcB6XIS7OK5V6AvRDNN7t5VJWQs1J40UmalbK56usBG/CuCHSYuc+rkUGeMCViNRARPrzW52N3oQLe6WifNliSuuGaH3czbVNudI9s7ZLUCLHVwWlyES522o1t14uvmbblmVTKqFjaZYJFSTPP4dLL1kU1z7p0lzdbRulmEWLxoQX+z9ce7A8GqEEucllLxePuZwdJl1Lezu0hoswvTPt61DrFcRuujV/2cmlxaGBC7Aw6cpovGANwRiSdOAWJ5AGy4gLL64dl0QhUEAuEUNws+XxV+OKGPdw/hESGYF9XEGaFC7sNLMSXWJjHsnanYi87VK428N2uxpOjOFANcagLM5l+7mSycM8KknZpKLcGi6jmzWGr/vLurZ/0g4u9AZuAoeb5r1ceQhyiTPY1E4wUR6u/F3H2ojSpXMMriBPT9cezTto8Cx+MsglHL4fv1Rxrb1LVw9yvyQpJ3AhFnLZfuRLH2QsOG3FGGD20X/th/u5bFAt16Bt308KjF+MNOXgl/SquIEySX3GhaZvc67KZbDxcCDORz2N8yCWPaY5lyQZO7lQ29fnZbt3Xu6qoge4+DjXl/MocySPOp9rlvdyznahRyHEYd77v3LhugOXDv4J65QXfl803BDAdaWBEDhfVx7nKofjoVCgxnUAqw/UAUDPn788BDvQuG4TDtdtUPvzjSlXAB8DvaDOhhrmhwbywylXAm8CvaouikJTL93gs3y7Yy4VYbIxOHrcMizPqWOjqO9l3Uz52kibQy4xxOgqhJvD+w5rvokOcAlGvNCfeqCv1ste1stzLm0f71Iq3ZfTrPfuE5nhPtF+LvQE2lffQC7pYtQy3tdzdrKvd5TLVVzDetScS3nEKmmwDyt1Cev1kX3YfbvzNK4fzrlw+cB6vm+uiUgf2zdXI62241LawCb7Pi5FXFPF8KpzDoF/Sw2lg+GrHNbno1mhPu+VCF/vfMnw06PnUl6j48dVHD3jHNHPua+fc3o/5yp/zsGi0vYtzi3Pz5mHd4T6BWMIlewacd63AAAAAElFTkSuQmCC',
data: 'iVBORw0KGgoAAAANSUhEUgAAANcAAAA4CAMAAABZsZ3QAAAAM1BMVEX29fK42OU+oMvn7u9drtIPisHI4OhstdWZyt4fkcXX5+sAg74umMhNp86p0eJ7vNiKw9v/UV4wAAAAAXRSTlMAQObYZgAABBxJREFUeF7tmuty4yAMhZG4X2zn/Z92J5tsBJwWXG/i3XR6frW2Y/SBLIRAfaQUDNt8E5tLUt9BycfcKfq3R6Mlfyimtx4rzp+K3dtibXkor99zsEqLYZltblTecciogoh+TXfY1Ve4dn07rCDGG9dHSEEOg/GmXl0U1XDxTKxNK5De7BxsyyBr6gGm2/vPxKJ8F6f7BXKfRMp1xIWK9A+5ks25alSb353dWnDJN1k35EL5f8dVGifTf/4tjUuuFq7u4srmXC60yAmldLXIWbg65RKU87lcGxJCFqUPv0IacW0PmSivOZFLE908inPToMmii/roG+MRV/O8FU88i8tFsxV3a06MFUw0Qu7RmAtdV5/HVVaOVMTWNOWSwMljLhzhcB6XIS7OK5V6AvRDNN7t5VJWQs1J40UmalbK56usBG/CuCHSYuc+rkUGeMCViNRARPrzW52N3oQLe6WifNliSuuGaH3czbVNudI9s7ZLUCLHVwWlyES522o1t14uvmbblmVTKqFjaZYJFSTPP4dLL1kU1z7p0lzdbRulmEWLxoQX+z9ce7A8GqEEucllLxePuZwdJl1Lezu0hoswvTPt61DrFcRuujV/2cmlxaGBC7Aw6cpovGANwRiSdOAWJ5AGy4gLL64dl0QhUEAuEUNws+XxV+OKGPdw/hESGYF9XEGaFC7sNLMSXWJjHsnanYi87VK428N2uxpOjOFANcagLM5l+7mSycM8KknZpKLcGi6jmzWGr/vLurZ/0g4u9AZuAoeb5r1ceQhyiTPY1E4wUR6u/F3H2ojSpXMMriBPT9cezTto8Cx+MsglHL4fv1Rxrb1LVw9yvyQpJ3AhFnLZfuRLH2QsOG3FGGD20X/th/u5bFAt16Bt308KjF+MNOXgl/SquIEySX3GhaZvc67KZbDxcCDORz2N8yCWPaY5lyQZO7lQ29fnZbt3Xu6qoge4+DjXl/MocySPOp9rlvdyznahRyHEYd77v3LhugOXDv4J65QXfl803BDAdaWBEDhfVx7nKofjoVCgxnUAqw/UAUDPn788BDvQuG4TDtdtUPvzjSlXAB8DvaDOhhrmhwbywylXAm8CvaouikJTL93gs3y7Yy4VYbIxOHrcMizPqWOjqO9l3Uz52kibQy4xxOgqhJvD+w5rvokOcAlGvNCfeqCv1ste1stzLm0f71Iq3ZfTrPfuE5nhPtF+LvQE2lffQC7pYtQy3tdzdrKvd5TLVVzDetScS3nEKmmwDyt1Cev1kX3YfbvzNK4fzrlw+cB6vm+uiUgf2zdXI62241LawCb7Pi5FXFPF8KpzDoF/Sw2lg+GrHNbno1mhPu+VCF/vfMnw06PnUl6j48dVHD3jHNHPua+fc3o/5yp/zsGi0vYtzi3Pz5mHd4T6BWMIlewacd63AAAAAElFTkSuQmCC',
encoding: 'base64',
filename: 'image.png',
'content-type': 'image/png',
Expand Down
6 changes: 2 additions & 4 deletions cypress/support/reset-fixture.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ function setup() {
method: 'POST',
url: `${api_url}/RobotRemote`,
headers: { Accept: 'text/xml', 'content-type': 'text/xml' },
body:
'<?xml version="1.0"?><methodCall><methodName>run_keyword</methodName><params><param><value><string>remote_zodb_setup</string></value></param><param><value><array><data><value><string>plone.app.robotframework.testing.PLONE_ROBOT_TESTING</string></value></data></array></value></param></params></methodCall>',
body: '<?xml version="1.0"?><methodCall><methodName>run_keyword</methodName><params><param><value><string>remote_zodb_setup</string></value></param><param><value><array><data><value><string>plone.app.robotframework.testing.PLONE_ROBOT_TESTING</string></value></data></array></value></param></params></methodCall>',
}).then(() => cy.log('Setting up API fixture'));
}

Expand All @@ -15,8 +14,7 @@ function teardown() {
method: 'POST',
url: `${api_url}/RobotRemote`,
headers: { Accept: 'text/xml', 'content-type': 'text/xml' },
body:
'<?xml version="1.0"?><methodCall><methodName>run_keyword</methodName><params><param><value><string>remote_zodb_teardown</string></value></param><param><value><array><data><value><string>plone.app.robotframework.testing.PLONE_ROBOT_TESTING</string></value></data></array></value></param></params></methodCall>',
body: '<?xml version="1.0"?><methodCall><methodName>run_keyword</methodName><params><param><value><string>remote_zodb_teardown</string></value></param><param><value><array><data><value><string>plone.app.robotframework.testing.PLONE_ROBOT_TESTING</string></value></data></array></value></param></params></methodCall>',
}).then(() => cy.log('Tearing down API fixture'));
}

Expand Down
122 changes: 67 additions & 55 deletions cypress/tests/core/basic/actions.js
Original file line number Diff line number Diff line change
@@ -1,57 +1,69 @@
describe('actions Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page-1',
contentTitle: 'My Page-1',
allow_discussion: true,
}
);
cy.visit('/contents');
});
it('copy', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(2).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/copy_of_my-page-1"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/copy_of_my-page-1/contents');
})
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page-1',
contentTitle: 'My Page-1',
allow_discussion: true,
});
cy.visit('/contents');
});
it('copy', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(2).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/copy_of_my-page-1"]').within(() => {
cy.get('a[class="icon-align-name"]').should(
'have.attr',
'href',
'/copy_of_my-page-1/contents',
);
});
});
it('delete', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(6).click();
cy.get('button[class="ui primary button"]').findByText('Delete').click();
cy.visit('/contents');
cy.get('tr').should('not.contain', '/my-page-1');
});
it('cut', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(1).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('a[class="icon-align-name"]').should(
'have.attr',
'href',
'/my-page-1/contents',
);
});
});
it('rename', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(0).click();
cy.get('#field-0_title').clear().type('my-page-rename');
cy.get('#field-0_id').clear().type('my-page-rename');
cy.get(
'button[class="ui basic circular primary right floated button"]',
).click();
cy.get('tr[aria-label="/my-page-rename"]').within(() => {
cy.get('a[class="icon-align-name"]').should(
'have.attr',
'href',
'/my-page-rename/contents',
);
});
});
it('delete', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(6).click();
cy.get('button[class="ui primary button"]').findByText('Delete').click();
cy.visit('/contents');
cy.get('tr').should('not.contain','/my-page-1');

});
it('cut', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('svg[class="icon dropdown-popup-trigger"]').click();
});
cy.get('a[class="item right-dropdown icon-align"]').eq(1).click();
cy.get('button[class="ui button icon item"]').click();
cy.visit('/contents');
cy.get('tr[aria-label="/my-page-1"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/my-page-1/contents');
})
});
it('rename', function () {
cy.get('tr[aria-label="/my-page-1"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
cy.get('button[class="ui button icon item"]').eq(0).click();
cy.get('#field-0_title').clear().type('my-page-rename');
cy.get('#field-0_id').clear().type('my-page-rename');
cy.get('button[class="ui basic circular primary right floated button"]').click();
cy.get('tr[aria-label="/my-page-rename"]').within(()=>{
cy.get('a[class="icon-align-name"]').should('have.attr', 'href', '/my-page-rename/contents');
})
})
});
});
29 changes: 15 additions & 14 deletions cypress/tests/core/basic/contactForm.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
describe('Contact Form Tests', () => {
beforeEach(() => {
cy.visit('/');
});
it('renders contact Form', function () {
cy.get('a:contains("Contact")').click();
cy.get('input[name="name"]').type('Myname');
cy.get('input[name="from"]').type('admin@admin.com');
cy.get('input[name="subject"]').type('Loreum Ipsium');
cy.get('textarea[name="message"]').type('Lorem Ipsum is simply dummy text of the printing and typesetting industry.');


cy.get('button[class="ui basic primary right floated button"]').click();
});
});
beforeEach(() => {
cy.visit('/');
});
it('renders contact Form', function () {
cy.get('a:contains("Contact")').click();
cy.get('input[name="name"]').type('Myname');
cy.get('input[name="from"]').type('admin@admin.com');
cy.get('input[name="subject"]').type('Loreum Ipsium');
cy.get('textarea[name="message"]').type(
'Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
);

cy.get('button[class="ui basic primary right floated button"]').click();
});
});
103 changes: 49 additions & 54 deletions cypress/tests/core/basic/view.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,50 @@
describe('Add Content Tests', () => {
beforeEach(() => {
cy.intercept('GET', `/**/*?expand*`).as('content');
// give a logged in editor and the site root
cy.autologin();
cy.visit('/');
cy.wait('@content');
});

it('As editor I can change the view to Listing View', function () {

cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Album view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});

it('As editor I can change the view to Summary View', function () {

cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Summary view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
it('As editor I can change the view to Tabular View', function () {

cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Tabular view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
it('As editor I can change the view to Album View', function () {

cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
});

beforeEach(() => {
cy.intercept('GET', `/**/*?expand*`).as('content');
// give a logged in editor and the site root
cy.autologin();
cy.visit('/');
cy.wait('@content');
});

it('As editor I can change the view to Listing View', function () {
cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Album view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});

it('As editor I can change the view to Summary View', function () {
cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Summary view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
it('As editor I can change the view to Tabular View', function () {
cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.findByText('Tabular view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
it('As editor I can change the view to Album View', function () {
cy.visit('/events');
cy.get('#toolbar-more').click();
cy.findByText('Listing view').click();
cy.visit('/events');
cy.wait('@content');
cy.wait(2000);
cy.get('main').contains('Event').should('be.visible');
});
});
43 changes: 21 additions & 22 deletions cypress/tests/core/basic/workflow.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
describe('workflow Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
allow_discussion: true,
}
);
cy.visit('/contents');
beforeEach(() => {
cy.autologin();
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
allow_discussion: true,
});
it('change workflow state recursively', function () {
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
})
cy.get('button[class="ui button icon item"]').eq(1).click();
cy.findByText('Select…').click();
cy.findByText('Publish').click();
cy.findByTitle('Save').click();
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('td > div').should('contain','Published');
})
cy.visit('/contents');
});
it('change workflow state recursively', function () {
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('button[class="ui basic icon button"]').click({ multiple: true });
});
});
cy.get('button[class="ui button icon item"]').eq(1).click();
cy.findByText('Select…').click();
cy.findByText('Publish').click();
cy.findByTitle('Save').click();
cy.get('tr[aria-label="/my-page"]').within(() => {
cy.get('td > div').should('contain', 'Published');
});
});
});