Skip to content

Commit

Permalink
Merge pull request #445 from almothafar/master
Browse files Browse the repository at this point in the history
E2E tests
  • Loading branch information
almothafar authored Sep 16, 2024
2 parents 310a36d + 3b3aa31 commit e4c3451
Show file tree
Hide file tree
Showing 14 changed files with 1,276 additions and 1,207 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ testem.log
Thumbs.db
*.iml
*.log
/cypress/
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [18.0.0] Major Update

- Adding e2e smock test for the project removing deprecated protractor adding cypress

## [17.0.0] Major Update

- Upgraded to support Angular 17
Expand Down
50 changes: 42 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@
"projects/auto-complete/**/*.html"
]
}
},
"ct": {
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "auto-complete:serve",
"watch": true,
"headless": false,
"testingType": "component"
},
"configurations": {
"development": {
"devServerTarget": "auto-complete:serve:development"
}
}
}
}
},
Expand Down Expand Up @@ -154,27 +168,47 @@
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"cypress-run": {
"builder": "@cypress/schematic:cypress",
"options": {
"protractorConfig": "projects/demo/e2e/protractor.conf.js"
"devServerTarget": "demo:serve",
"configFile": "projects/demo/cypress.config.ts"
},
"configurations": {
"production": {
"devServerTarget": "demo:serve:production"
},
"development": {
"devServerTarget": "demo:serve:development"
}
}
},
"cypress-open": {
"builder": "@cypress/schematic:cypress",
"options": {
"watch": true,
"headless": false,
"configFile": "projects/demo/cypress.config.ts"
}
},
"e2e": {
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "demo:serve",
"watch": true,
"headless": false
},
"defaultConfiguration": "development"
"configurations": {
"production": {
"devServerTarget": "demo:serve:production"
}
}
}
}
}
},
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
"@cypress/schematic",
"@angular-eslint/schematics",
"@schematics/angular"
],
"analytics": false
}
Expand Down
Loading

0 comments on commit e4c3451

Please sign in to comment.