From dee74f7556826ff10a2553cd06bfce561397524c Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 10 May 2024 20:48:00 +0200 Subject: [PATCH] chore(#41): make prettier config global to re-use it for e2e tests Signed-off-by: Christoph Heiss --- .prettierignore | 2 ++ frontend/.prettierrc => .prettierrc | 0 e2e/cypress.config.js | 6 +++--- e2e/cypress/e2e/addMessage.cy.js | 12 ++++++------ e2e/cypress/plugins/index.js | 2 +- e2e/cypress/support/commands.js | 16 ++++++++-------- e2e/cypress/support/e2e.js | 2 +- e2e/package-lock.json | 19 ++++++++++++++++++- e2e/package.json | 8 ++++++-- frontend/.prettierignore | 1 - 10 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 .prettierignore rename frontend/.prettierrc => .prettierrc (100%) delete mode 100644 frontend/.prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..1ca55a1 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +frontend/.angular +frontend/src/assets/ diff --git a/frontend/.prettierrc b/.prettierrc similarity index 100% rename from frontend/.prettierrc rename to .prettierrc diff --git a/e2e/cypress.config.js b/e2e/cypress.config.js index 4ee7737..fd19e97 100644 --- a/e2e/cypress.config.js +++ b/e2e/cypress.config.js @@ -1,4 +1,4 @@ -const { defineConfig } = require("cypress"); +const { defineConfig } = require('cypress'); module.exports = defineConfig({ reporter: 'cypress-multi-reporters', @@ -12,8 +12,8 @@ module.exports = defineConfig({ // We've imported your old cypress plugins here. // You may want to clean this up later by importing these. setupNodeEvents(on, config) { - return require('./cypress/plugins/index.js')(on, config) + return require('./cypress/plugins/index.js')(on, config); }, baseUrl: 'http://localhost:4200/', }, -}) +}); diff --git a/e2e/cypress/e2e/addMessage.cy.js b/e2e/cypress/e2e/addMessage.cy.js index 4a64ca2..22a2ff9 100644 --- a/e2e/cypress/e2e/addMessage.cy.js +++ b/e2e/cypress/e2e/addMessage.cy.js @@ -1,9 +1,9 @@ context('add message', () => { - let msgText = 'msg' + new Date().getTime(); + let msgText = 'msg' + new Date().getTime(); - it('create message', () => { - cy.createUser(); - cy.loginUser(); - cy.contains('Add message'); - }); + it('create message', () => { + cy.createUser(); + cy.loginUser(); + cy.contains('Add message'); + }); }); diff --git a/e2e/cypress/plugins/index.js b/e2e/cypress/plugins/index.js index 59b2bab..8229063 100644 --- a/e2e/cypress/plugins/index.js +++ b/e2e/cypress/plugins/index.js @@ -19,4 +19,4 @@ module.exports = (on, config) => { // `on` is used to hook into various events Cypress emits // `config` is the resolved Cypress config -} +}; diff --git a/e2e/cypress/support/commands.js b/e2e/cypress/support/commands.js index 5cfa1c6..ab48e78 100644 --- a/e2e/cypress/support/commands.js +++ b/e2e/cypress/support/commands.js @@ -10,12 +10,12 @@ Cypress.Commands.add('createUser', () => { }); }); -Cypress.Commands.add("loginUser", () => { - cy.fixture("settings").then((settings) => { - cy.visit(settings.baseUrl); - cy.get('[data-cy="open-login-dialog-button"]').click(); - cy.get('input[name="username"]').type(settings.username); - cy.get('input[name="password"]').type(settings.password); - cy.get('[data-cy="login-button"]').click(); - }); +Cypress.Commands.add('loginUser', () => { + cy.fixture('settings').then(settings => { + cy.visit(settings.baseUrl); + cy.get('[data-cy="open-login-dialog-button"]').click(); + cy.get('input[name="username"]').type(settings.username); + cy.get('input[name="password"]').type(settings.password); + cy.get('[data-cy="login-button"]').click(); + }); }); diff --git a/e2e/cypress/support/e2e.js b/e2e/cypress/support/e2e.js index d68db96..37a498f 100644 --- a/e2e/cypress/support/e2e.js +++ b/e2e/cypress/support/e2e.js @@ -14,7 +14,7 @@ // *********************************************************** // Import commands.js using ES2015 syntax: -import './commands' +import './commands'; // Alternatively you can use CommonJS syntax: // require('./commands') diff --git a/e2e/package-lock.json b/e2e/package-lock.json index d43e5ba..2f5fc12 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -14,7 +14,9 @@ "cypress-multi-reporters": "1.6.4", "mocha-junit-reporter": "2.2.1" }, - "devDependencies": {} + "devDependencies": { + "prettier": "^3.2.5" + } }, "node_modules/@colors/colors": { "version": "1.5.0", @@ -2323,6 +2325,21 @@ "node": ">=0.10.0" } }, + "node_modules/prettier": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", diff --git a/e2e/package.json b/e2e/package.json index 593c835..a90a891 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -10,10 +10,14 @@ "cypress-multi-reporters": "1.6.4", "mocha-junit-reporter": "2.2.1" }, - "devDependencies": {}, + "devDependencies": { + "prettier": "^3.2.5" + }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "cypress": "cypress run" + "cypress": "cypress run", + "prettier:check": "prettier --check '**/*.{json,html,scss,ts,js}'", + "prettier:fix": "prettier --write '**/*.{json,html,scss,ts,js}'" }, "author": "Heimo Stranner", "license": "ISC" diff --git a/frontend/.prettierignore b/frontend/.prettierignore deleted file mode 100644 index 1a1f875..0000000 --- a/frontend/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -src/assets/