Skip to content

Commit

Permalink
Merge pull request #41 from frlp-utn-ingsoft/dev
Browse files Browse the repository at this point in the history
Versión 1.3.0
  • Loading branch information
RodrigoJacznik authored Jun 5, 2023
2 parents d2fa108 + a39bf4d commit 53d65b6
Show file tree
Hide file tree
Showing 19 changed files with 1,272 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
playwright.config.js
test/
31 changes: 31 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module.exports = {
"env": {
"es2021": true,
"node": true
},
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"no-unused-vars": 0,
"no-undef": 0,
"no-else-return": 0,
"no-empty-function": 0,
"no-eq-null": 0,
"eqeqeq": 0,
"dot-notation": 0,
"curly": 0,
"complexity": 0
},
"overrides": [
{
"files": ["src/public/**/*.js"],
"env": {
"es2021": true,
"browser": true,
}
}
]
}
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ jobs:
node-version: '18.x'
- run: npm ci
- run: npm run build --if-present
- run: npm run lint
- run: npm run test
27 changes: 27 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Playwright Tests
on:
push:
branches: [ main, dev ]
pull_request:
branches: [ main, dev ]
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Run Playwright tests
run: npm run test:e2e
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,8 @@ dist
# TernJS port file
.tern-port

db.sqlite3
db.sqlite3
db.test.sqlite3
/test-results/
/playwright-report/
/playwright/.cache/
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.3.0] 05-06-2023

### Added

- Interfaz básica de la calculadora
- ESLint para tests estáticos
- Playwright para tests e2e

## [1.2.0] 15-05-2023

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ReCalc v1.2.0
# ReCalc v1.3.0

Calculadora con funciones simples.

Expand Down
Loading

0 comments on commit 53d65b6

Please sign in to comment.