Skip to content

Commit 68416e0

Browse files
committed
Merge branch 'feature/update-dependencies' into develop
2 parents 567c49e + efb815f commit 68416e0

File tree

2 files changed

+7
-32
lines changed

2 files changed

+7
-32
lines changed

README.md

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -144,31 +144,6 @@ To run the unit tests:
144144
npm test
145145
```
146146

147-
## Running The E2E Tests
148-
Integration tests are performed with [Protractor](http://angular.github.io/protractor/#/).
149-
150-
1. Place your E2E-Tests into the folder ```test/e2e/src```
151-
152-
2. Run the tests by invoking
153-
154-
```shell
155-
npm run e2e
156-
```
157-
158-
### Running e2e tests manually
159-
160-
1. Make sure your app runs and is accessible
161-
162-
```shell
163-
WEBPACK_PORT=19876 npm start
164-
```
165-
166-
3. Once bundle is ready, run the E2E-Tests in another console
167-
168-
```shell
169-
npm run e2e:start
170-
```
171-
172147
## Environment confugration
173148
There is a configuration management in place. Three standart environments are already set (devlopment, test and production).
174149
You can also add more environments with ```--env.target <env-name>``` but there is a catch: You have to add ```--``` for each npm command you

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
"aurelia-fetch-client": "^1.0.1",
8080
"aurelia-framework": "^1.0.7",
8181
"aurelia-history-browser": "^1.0.0",
82-
"aurelia-i18n": "^1.2.1",
82+
"aurelia-i18n": "^1.3.0",
8383
"aurelia-loader-webpack": "^2.0.0",
8484
"aurelia-logging-console": "^1.0.0",
8585
"aurelia-pal-browser": "^1.0.0",
8686
"aurelia-polyfills": "^1.1.1",
8787
"aurelia-route-recognizer": "^1.1.0",
88-
"aurelia-router": "^1.0.7",
89-
"aurelia-templating-binding": "^1.1.0",
88+
"aurelia-router": "^1.1.1",
89+
"aurelia-templating-binding": "^1.2.0",
9090
"aurelia-templating-resources": "^1.2.0",
9191
"aurelia-templating-router": "^1.0.0",
9292
"bootstrap-sass": "^3.3.7",
@@ -114,12 +114,12 @@
114114
"@easy-webpack/config-typescript": "5.1.0",
115115
"@easy-webpack/config-uglify": "2.2.3",
116116
"@easy-webpack/core": "2.0.1",
117-
"aurelia-template-lint-loader": "1.0.0",
117+
"aurelia-template-lint-loader": "1.0.1",
118118
"chalk": "^1.1.3",
119119
"compression-webpack-plugin": "0.3.2",
120120
"concurrently": "3.1.0",
121-
"cross-env": "3.1.3",
122-
"electron": "1.4.13",
121+
"cross-env": "3.1.4",
122+
"electron": "1.4.14",
123123
"favicons-webpack-plugin": "0.0.7",
124124
"fs": "0.0.1-security",
125125
"http-server": "0.9.0",
@@ -141,7 +141,7 @@
141141
"typedoc-webpack-plugin": "^1.1.3",
142142
"typescript": "^2.1",
143143
"wait-on": "2.0.1",
144-
"wallaby-webpack": "0.0.27",
144+
"wallaby-webpack": "0.0.30",
145145
"webpack": "2.1.0-beta.27",
146146
"webpack-dev-server": "2.1.0-beta.12",
147147
"webpack-notifier": "1.5.0"

0 commit comments

Comments
 (0)