Skip to content

Commit

Permalink
test(integration): Move integration tests to top-level folders
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed May 9, 2018
1 parent cb3a07e commit c0be0ab
Show file tree
Hide file tree
Showing 68 changed files with 899 additions and 44 deletions.
16 changes: 8 additions & 8 deletions downstream_projects.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"angular5": "./test/angular-versions/v5",
"angular6": "./test/angular-versions/v6",
"typescript2.3": "./test/typescript-versions/typescript2.3",
"typescript2.4": "./test/typescript-versions/typescript2.4",
"typescript2.5": "./test/typescript-versions/typescript2.5",
"typescript2.6": "./test/typescript-versions/typescript2.6",
"typescript2.7": "./test/typescript-versions/typescript2.7",
"typescript2.8": "./test/typescript-versions/typescript2.8",
"angular5": "./test-angular-versions/v5",
"angular6": "./test-angular-versions/v6",
"typescript2.3": "./test-typescript-versions/typescript2.3",
"typescript2.4": "./test-typescript-versions/typescript2.4",
"typescript2.5": "./test-typescript-versions/typescript2.5",
"typescript2.6": "./test-typescript-versions/typescript2.6",
"typescript2.7": "./test-typescript-versions/typescript2.7",
"typescript2.8": "./test-typescript-versions/typescript2.8",
"sample-app-angular": "https://github.com/ui-router/sample-app-angular.git"
}
8 changes: 8 additions & 0 deletions test-angular-versions/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*/cypress/fixtures
*/cypress/plugins
*/cypress/screenshots
*/cypress/videos
*/cypress/support
**/bundle.js
*/yarn.lock

55 changes: 55 additions & 0 deletions test-angular-versions/v5/.angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "angular-v5"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": ["assets", "favicon.ico"],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": ["styles.css"],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
43 changes: 43 additions & 0 deletions test-angular-versions/v5/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"ng": "ng",
"start": "ng serve --prod --source-map",
"build": "ng build --prod --source-map",
"test": "ng test",
"test": "npm run e2e",
"lint": "ng lint",
"e2e": "ng e2e"
"e2e": "npm run build && cypress-runner run --path dist/angularV6"
},
"private": true,
"dependencies": {
Expand All @@ -33,6 +33,7 @@
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"@uirouter/cypress-runner": "^1.0.7",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c0be0ab

Please sign in to comment.