Skip to content

Commit

Permalink
Merge pull request #68 from xpadev-net/refactor
Browse files Browse the repository at this point in the history
Refactor
  • Loading branch information
xpadev-net authored Nov 29, 2023
2 parents 22a8f8d + e6adb15 commit 74cdfb4
Show file tree
Hide file tree
Showing 17 changed files with 239 additions and 910 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Playwright Tests
on:
push:
branches: [master, develop, feature/*]
branches: [master, develop]
pull_request:
branches: [master]
branches: [master, develop]
jobs:
test:
timeout-minutes: 60
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lint:fix": "npm run format&&npm run eslint:fix&&npm run check-types",
"prepare": "husky install",
"test": "docker-compose run --rm pw",
"test-server": "lite-server"
"test-server": "http-server"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -55,15 +55,14 @@
"@types/node": "^20.9.2",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"concurrently": "^8.2.2",
"copyfiles": "^2.4.1",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-jsdoc": "^46.9.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"http-server": "^14.1.1",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"lite-server": "^2.6.1",
"prettier": "^3.1.0",
"rimraf": "^5.0.5",
"rollup": "^4.5.0",
Expand Down
4 changes: 2 additions & 2 deletions playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { devices } from "@playwright/test";
const config: PlaywrightTestConfig = {
testDir: "./src/__tests__",
use: {
baseURL: "http://127.0.0.1:3000",
baseURL: "http://127.0.0.1:8080",
},
projects: [
{
Expand All @@ -14,7 +14,7 @@ const config: PlaywrightTestConfig = {
],
webServer: {
command: "npm run test-server",
url: "http://127.0.0.1:3000/docs/sample/index.html",
url: "http://127.0.0.1:8080/docs/sample/index.html",
reuseExistingServer: !process.env.CI,
},
};
Expand Down
Loading

0 comments on commit 74cdfb4

Please sign in to comment.