Skip to content

Commit

Permalink
Cypress: fusion of 2 two folders
Browse files Browse the repository at this point in the history
  • Loading branch information
qmonmert committed Nov 5, 2024
1 parent a06392f commit 71e17ab
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 37 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"dev": "npm-run-all --parallel dev:*",
"dev:tikui": "tikui-core serve",
"dev:vite": "vite",
"e2e": "cypress open --config-file src/test/webapp/e2e/cypress-config.ts",
"e2e:headless": "cypress run --headless --config-file src/test/webapp/e2e/cypress-config.ts",
"e2e": "cypress open --config-file src/test/webapp/component/cypress-config.ts",
"e2e:headless": "cypress run --headless --config-file src/test/webapp/component/cypress-config.ts",
"format": "npm run prettier:format",
"glyph:build": "rimraf .fontello-session && fontello-cli install --config src/main/glyph/config.json --font src/main/glyph/font --css src/main/glyph/css",
"glyph:open": "rimraf .fontello-session && fontello-cli open --config src/main/glyph/config.json",
Expand All @@ -37,8 +37,8 @@
"preview": "vite preview",
"start": "npm run dev",
"test": "npm run test:watch",
"test:component": "start-server-and-test tikui:serve-build http://localhost:9005 dev:vite http://localhost:9000 'cypress open --e2e --config-file src/test/webapp/component/cypress-config.ts'",
"test:component:headless": "start-server-and-test tikui:serve-build http://localhost:9005 dev:vite http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config.ts'",
"test:component": "start-server-and-test tikui:serve-build http://localhost:9005 dev:vite http://localhost:9000 'cypress open --e2e --config-file src/test/webapp/component/cypress-config-9000.ts'",
"test:component:headless": "start-server-and-test tikui:serve-build http://localhost:9005 dev:vite http://localhost:9000 'cypress run --headless --config-file src/test/webapp/component/cypress-config-9000.ts'",
"test:coverage": "vitest run --coverage",
"test:watch": "vitest --",
"tikui:serve-build": "tikui-core build && serve -p 9005 target/classes/public/style",
Expand Down
12 changes: 12 additions & 0 deletions src/test/webapp/component/cypress-config-9000.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:9000',
specPattern: 'src/test/webapp/component/integration/**/*.spec.ts',
fixturesFolder: 'src/test/webapp/component/fixtures',
supportFolder: 'src/test/webapp/component/support',
supportFile: false,
video: false,
},
});
2 changes: 1 addition & 1 deletion src/test/webapp/component/cypress-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { defineConfig } from 'cypress';

export default defineConfig({
e2e: {
baseUrl: 'http://localhost:9000',
baseUrl: 'http://localhost:7471',
specPattern: 'src/test/webapp/component/integration/**/*.spec.ts',
fixturesFolder: 'src/test/webapp/component/fixtures',
supportFolder: 'src/test/webapp/component/support',
Expand Down
12 changes: 0 additions & 12 deletions src/test/webapp/e2e/cypress-config.ts

This file was deleted.

9 changes: 0 additions & 9 deletions src/test/webapp/e2e/integration/Patch.spec.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/test/webapp/e2e/support/selector.ts

This file was deleted.

10 changes: 0 additions & 10 deletions src/test/webapp/e2e/tsconfig.json

This file was deleted.

0 comments on commit 71e17ab

Please sign in to comment.