Skip to content

Commit

Permalink
merge ok
Browse files Browse the repository at this point in the history
  • Loading branch information
Aschen committed Nov 22, 2019
1 parent aed6e58 commit 2d9afc6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
name: "Linter"
script:
- npm install
- npm run lint
- npm run test:lint

# ---------------------------------------
# Unit Testing
Expand All @@ -47,7 +47,7 @@ jobs:
name: "Unit Tests"
script:
- npm install
- npm run unit
- npm run test:unit

after_script:
- npm run codecov
Expand All @@ -66,7 +66,7 @@ jobs:

script:
- npm install
- CYPRESS_RETRIES=5 npm run e2e
- CYPRESS_RETRIES=5 npm run test:e2e

# ---------------------------------------
# Regular Build & Deploy
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,22 +436,22 @@ npm test
This executes both unit and end-to-end tests. To run only the unit-tests, run

```
npm run unit
npm run test:unit
```

### End-to-end

To run the end-to-end tests in headless mode, run

```
npm run e2e
npm run test:e2e
```

To run the end-to-end tests in headful mode, run

```
npm run dev
npm run e2e-local
npm run test:e2e-local
```

We use Cypress.io to e2e test the UI. You can use it locally (via the local dashboard) or in the CI (using the cloud-hosted dashboard). Cypress is an awesome tool, but this has a price. They had to re-invent a little bit the wheel so, even if writing and running tests looks extremely smooth, it is still recommended to understand _how_ this magic is achieved. Before writing tests, you are encouraged to read the following docs:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ npm test
This executes both unit and end-to-end tests. To run only the unit-tests, run

```
npm run unit
npm run test:unit
```

To run the end-to-end tests in headless mode, run

```
npm run e2e
npm run test:e2e
```

To run the end-to-end tests in headful mode, run

```
npm run dev
npm run e2e-local
npm run test:e2e-local
```

Please refer to the CONTRIBUTING file to learn more about how to write code and tests for this project.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"scripts": {
"dev": "node build/dev-server.js",
"build": "node build/build.js",
"unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
"test:unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
"codecov": "cat test/unit/coverage/lcov.info | ./node_modules/.bin/codecov",
"e2e": "docker-compose -f test/e2e/docker-compose.yml up -d && ./test/e2e/run-test.sh",
"e2e-local": "docker-compose -f test/e2e/docker-compose.yml up -d && e2eLocal=1 ./test/e2e/run-test.sh",
"test": "npm run unit && npm run codecov && npm run e2e",
"lint": "eslint --ext .js,.vue src/ test/",
"test:e2e": "docker-compose -f test/e2e/docker-compose.yml up -d && ./test/e2e/run-test.sh",
"test:e2e-local": "docker-compose -f test/e2e/docker-compose.yml up -d && e2eLocal=1 ./test/e2e/run-test.sh",
"test": "npm run test:unit && npm run codecov && npm run test:e2e",
"test:lint": "eslint --ext .js,.vue src/ test/",
"install_deps": "npm i --unsafe-perm",
"prepublishOnly": "npm run build",
"start": "http-server dist -p 3000",
Expand Down

0 comments on commit 2d9afc6

Please sign in to comment.