Skip to content

Commit

Permalink
Resolve conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
rogoit committed Dec 25, 2023
2 parents 8efe817 + daf109b commit 8d1ef2e
Show file tree
Hide file tree
Showing 20 changed files with 3,364 additions and 100 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
37 changes: 37 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2021
},
"plugins": ["cypress", "@typescript-eslint", "prettier"],
"extends": [
"prettier",
"plugin:prettier/recommended",
"plugin:jsonc/recommended-with-jsonc",
"eslint:recommended",
"plugin:cypress/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended"
],
"overrides": [
{
"files": ["*.json", "*.json5", "*.jsonc"],
"parser": "jsonc-eslint-parser"
}
],
"rules": {
"@typescript-eslint/no-namespace": "off",
"cypress/no-assigning-return-values": "error",
"cypress/no-unnecessary-waiting": "error",
"cypress/assertion-before-screenshot": "warn",
"cypress/no-force": "warn",
"cypress/no-async-tests": "error",
"prettier/prettier": 2,
"indent": ["error", 2]
},
"env": {
"cypress/globals": true,
"node": true
}
}
29 changes: 29 additions & 0 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Composer Audit
on:
[push]
jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Composer cache dependencies
uses: actions/cache@v3
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

- uses: php-actions/composer@v6
with:
php_version: "8.1"
php_extensions: zip imagick
memory_limit: 512M

- uses: php-actions/composer@v6
with:
php_version: "8.1"
php_extensions: zip imagick
memory_limit: 512M
command: audit
81 changes: 81 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,84 @@ docker-compose.ubuntu.yml
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

cypress/videos
cypress/screenshots


###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
"docs": "http://docs.sulu.io/"
},
"require": {
"php": "^8.1",
"php": "8.1.*",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-zip": "*",
"dantleech/phpcr-migrations-bundle": "^1.2",
"dg/twitter-php": "^4.1",
"doctrine/dbal": "^2.10",
Expand Down
7 changes: 4 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
baseUrl: 'https://nevercodealone.de'
},
viewportWidth: 1200
});
11 changes: 11 additions & 0 deletions cypress/e2e/startpage-valid-internal-urls.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// <reference types="Cypress" />
describe('TESTIFY base tests', () => {
beforeEach(() => {
cy.visit('/');
});

it('Imprint link on starpage is clickable', () => {
cy.ttRunTestifyBaseTests();
});

});
Empty file added cypress/fixtures/.gitkeep
Empty file.
1 change: 1 addition & 0 deletions cypress/pages/BasePage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export abstract class BasePage {}
3 changes: 3 additions & 0 deletions cypress/pages/StartPage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { BasePage } from '@/pages/BasePage';

export class StartPage extends BasePage {}
24 changes: 24 additions & 0 deletions cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add('login', (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
31 changes: 31 additions & 0 deletions cypress/support/e2e.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// ***********************************************************
// This example support/e2e.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands';

import 'cypress-ncatestify-plugin';

// Alternatively you can use CommonJS syntax:
// require('./commands')

Cypress.on('uncaught:exception', (err, promise) => {
if (err.message.includes('o.removeEventListener')) {
return false;
}
if (promise) {
return false;
}
});
1 change: 1 addition & 0 deletions cypress/support/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare namespace Cypress {}
Loading

0 comments on commit 8d1ef2e

Please sign in to comment.