Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/angular 14 #908

Merged
merged 14 commits into from
Aug 16, 2022
Merged
5 changes: 3 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ jobs:
- name: Checkout
uses: actions/checkout@v1
- name: Cypress run
uses: cypress-io/github-action@v2
uses: cypress-io/github-action@v4
with:
start: npm run start:coverage
wait-on: 'http://localhost:4200, http://ebad.herokuapp.com/ebad/actuator/health'
wait-on-timeout: 180
browser: chrome
command-prefix: npx
install-command: npm ci --legacy-peer-deps
- uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: cypress/screenshots
- uses: actions/upload-artifact@v2
if: always()
if: failure()
with:
name: cypress-videos
path: cypress/videos
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 17.x]
node-version: [16.x, 17.x, 18.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -19,7 +19,7 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: npm install, build, and test
run: |
npm ci
npm ci --legacy-peer-deps
npm run build --if-present
# npm test
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# EbadFront

This project use Angular version : 13.1.1
This project use Angular version : 14.0.0

![home_ebad](./docs_images/ebad_home.png)

Expand Down
1 change: 0 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
}
}
},
"defaultProject": "ebad-front",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
Expand Down
14 changes: 14 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { defineConfig } from 'cypress'

export default defineConfig({
viewportWidth: 1920,
viewportHeight: 1080,
defaultCommandTimeout: 10000,
e2e: {
// 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)
},
},
})
6 changes: 0 additions & 6 deletions cypress.json

This file was deleted.

2 changes: 1 addition & 1 deletion cypress/coverage.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
rules: [
{
test: /\.(js|ts)$/,
loader: 'istanbul-instrumenter-loader',
loader: '@jsdevtools/coverage-istanbul-loader',
options: { esModules: true },
enforce: 'post',
include: require('path').join(__dirname, '..', 'src'),
Expand Down
File renamed without changes.
Loading