diff --git a/.travis.yml b/.travis.yml
index f0493719df..2287dd656c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,17 @@ addons:
repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
language: node_js
node_js:
- - "6"
- "7"
before_install:
- export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
+ - sh -e /etc/init.d/xvfb start &
+ - sleep 3
before_script:
- yarn build
script:
- yarn test
after_script:
- cat coverage/lcov.info | codeclimate
+cache:
+ directories:
+ - node_modules
diff --git a/docs/content/sequenceDiagram.md b/docs/content/sequenceDiagram.md
index f21514633b..c2cbb19cb9 100755
--- a/docs/content/sequenceDiagram.md
+++ b/docs/content/sequenceDiagram.md
@@ -103,7 +103,7 @@ Activations can be stacked for same actor:
```
sequenceDiagram
Alice->>+John: Hello John, how are you?
- Alice->>+John: John, can yoy hear me?
+ Alice->>+John: John, can you hear me?
John-->>-Alice: Hi Alice, I can hear you!
John-->>-Alice: I feel great!
```
@@ -113,7 +113,7 @@ Stacked activations look like this:
```mermaid
sequenceDiagram
Alice->>+John: Hello John, how are you?
- Alice->>+John: John, can yoy hear me?
+ Alice->>+John: John, can you hear me?
John-->>-Alice: Hi Alice, I can hear you!
John-->>-Alice: I feel great!
```
diff --git a/karma.conf.js b/karma.conf.js
index 3e43f9a750..b6b7b20f98 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -74,7 +74,8 @@ module.exports = function (config) {
ChromeHeadless: {
base: 'Chrome',
flags: [
- '--headless',
+ '--incognito',
+ // '--headless',
'--disable-gpu',
'--no-sandbox',
// Without a remote debugging port, Google Chrome exits immediately.
diff --git a/package.json b/package.json
index 3b373998b4..96fd1d7102 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"lint": "node_modules/.bin/standard",
"karma": "node node_modules/karma/bin/karma start karma.conf.js --single-run",
"tape": "node node_modules/tape/bin/tape test/cli_test-*.js",
- "test": "yarn run tape && yarn run karma",
+ "test": "yarn tape && yarn karma",
"live": "live-server ./test/examples",
"jison": "gulp jison_legacy",
"live_server": "gulp live-server",
@@ -59,14 +59,14 @@
"which": "^1.2.14"
},
"devDependencies": {
- "async": "^2.3.0",
+ "async": "^2.4.1",
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
"babel-plugin-transform-remove-strict-mode": "^0.0.2",
- "babel-preset-env": "^1.4.0",
+ "babel-preset-env": "^1.5.1",
"clone": "^2.1.1",
"codeclimate-test-reporter": "0.4.1",
- "css-loader": "^0.28.0",
+ "css-loader": "^0.28.4",
"dox": "^0.9.0",
"event-stream": "^3.3.4",
"extract-text-webpack-plugin": "^2.1.0",
@@ -99,28 +99,28 @@
"gulp-vartree": "^2.0.1",
"hogan.js": "^3.0.2",
"inject-loader": "^3.0.0",
- "jasmine": "2.5.3",
+ "jasmine": "2.6.0",
"jasmine-es6": "0.4.0",
"jison": "^0.4.17",
- "jsdom": "^9.12.0",
- "karma": "^1.6.0",
- "karma-chrome-launcher": "^2.0.0",
+ "jsdom": "^11.0.0",
+ "karma": "^1.7.0",
+ "karma-chrome-launcher": "^2.1.1",
"karma-jasmine": "^1.1.0",
"karma-webpack": "^2.0.3",
"less": "^2.7.2",
- "less-loader": "^4.0.3",
+ "less-loader": "^4.0.4",
"live-server": "^1.2.0",
"map-stream": "0.0.7",
"marked": "^0.3.6",
"mock-browser": "^0.92.14",
- "npm-check-updates": "^2.11.0",
+ "npm-check-updates": "^2.11.2",
"phantomjs-prebuilt": "^2.1.14",
"require-dir": "^0.3.1",
"rimraf": "^2.6.1",
"standard": "^10.0.2",
- "style-loader": "^0.16.1",
+ "style-loader": "^0.18.1",
"tape": "^4.6.3",
- "webpack": "^2.4.1",
- "webpack-node-externals": "^1.5.4"
+ "webpack": "^2.6.1",
+ "webpack-node-externals": "^1.6.0"
}
}
diff --git a/test/index.html b/test/index.html
index cf20da8f09..565782c6f5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -10,7 +10,7 @@
-
+
@@ -21,4 +21,4 @@
-