Skip to content

Commit

Permalink
Merge branch 'angular-8'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
Tim Nederhoff committed Jun 11, 2019
2 parents 95d2974 + e737f9a commit ed95511
Show file tree
Hide file tree
Showing 37 changed files with 11,744 additions and 1,781 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Transpiled js files
*.js
*.js.map

# Logs
logs
*.log
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
**/*.js.map

node_modules
demo-app

*.tgz
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $ npm install --save-dev @politie/angular-testcafe-builder
"my-project-e2e": {
"architect": {
"e2e": {
"builder": "angular-testcafe-builder:testcafe",
"builder": "@politie/angular-testcafe-builder:testcafe",
"options": {
"browsers": [
"chrome --no-sandbox",
Expand Down
2 changes: 1 addition & 1 deletion builders.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "@angular-devkit/architect/src/builders-schema.json",
"builders": {
"testcafe": {
"class": "./src/testcafe/testcafe.builder.js",
"implementation": "./src/testcafe/testcafe.builder.js",
"schema": "./src/testcafe/schema.json",
"description": "Builder that runs TestCafe after the Angular application is served"
}
Expand Down
13 changes: 13 additions & 0 deletions demo-app/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
46 changes: 46 additions & 0 deletions demo-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events.json
speed-measure-plugin.json

# 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
.history/*

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

# System Files
.DS_Store
Thumbs.db
27 changes: 27 additions & 0 deletions demo-app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# DemoApp

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.1.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
138 changes: 138 additions & 0 deletions demo-app/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"demo-app": {
"projectType": "application",
"schematics": {},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/demo-app",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "demo-app:build",
"host": "localhost",
"baseHref": "localhost",
"port": 4200
},
"configurations": {
"production": {
"browserTarget": "demo-app:build:production"
},
"stubbed": {
"browserTarget": "demo-app:build",
"publicHost": "localhost:4200",
"progress": false
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "demo-app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@politie/angular-testcafe-builder:testcafe",
"options": {
"devServerTarget": "demo-app:serve:stubbed",
"browsers": [
"chrome --no-sandbox --window-size=1920,1080"
],
"host": "localhost",
"port": 4200
},
"configurations": {
"passing": {
"src": "e2e/passing.e2e-spec.ts"
},
"failing": {
"src": "e2e/passing.e2e-spec.ts"
},
"error": {
"src": "my/invalid/path-to-src"
}
}
}
}
}
},
"defaultProject": "demo-app"
}
12 changes: 12 additions & 0 deletions demo-app/browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
5 changes: 5 additions & 0 deletions demo-app/e2e/failing.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Selector } from 'testcafe';

fixture('Failing').page('http://localhost:4200');

test('foo equals bar', async t => await t.expect('foo').eql('bar'));
5 changes: 5 additions & 0 deletions demo-app/e2e/passing.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Selector } from 'testcafe';

fixture('Passing').page('http://localhost:4200');

test('foo equals foo', async t => await t.expect('foo').eql('foo'));
Loading

0 comments on commit ed95511

Please sign in to comment.