Skip to content

Commit

Permalink
fixed babel setup
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-bromann committed Jul 19, 2016
1 parent 6e07ce5 commit ada03f6
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 8 deletions.
6 changes: 5 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"presets": ["es2015", "stage-0"],
"plugins": ["transform-async-to-generator"]
"plugins": [
"syntax-async-functions",
"transform-regenerator",
"transform-runtime"
]
}
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ before_script:

script: "sleep 5 && npm run test-snyk && npm run test"

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8

# after_script:
# - "[ -d ./coverage ] && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"

Expand All @@ -24,6 +31,7 @@ addons:

env:
global:
- CXX: g++-4.8
- pm_config_engine_strict: false
- secure: f6+NU5WBW9GPLRV2WhtCozPOjFOAdh52hXfr0dZopxl0eqJ426fl5UCt54duUQV/abBpNEKzBm2015EsBP14wepNJ9+Q6nRwrj/h2PvI3UM8vEPqgH08hqiS7kFszA0Wy+Ki3umncQbA5WAgq6grmZs9naELWmOX5Yum40Wl9/0=
- secure: dMTVz/kDqs+qBMqB6CZEHrvSYIkqxCTa0fnVPNH1vyiJ02a66yQrZhdxH6PrZjk8iYW8CAh8mLjrYlaOAPG6UL3gjecYVCegyMKIU3GI6CgBYOQOaU4xo2ypK7COqHkRYPJ+G5fyQfcZrB97iccpC1CUy88R0pGq/sb3teKTV7w=
Expand Down
9 changes: 7 additions & 2 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ module.exports = function (grunt) {
report: ['lcov', 'html'],
excludes: ['**/scripts/**', '**/gruntfile.js'],
verbose: true,
mochaOptions: ['--compilers', 'js:babel-register', '--recursive', '-t', '120000', '--reporter', 'spec']
mochaOptions: [
'--compilers', 'js:babel-register',
'--recursive',
'--timeout', '120000',
'--reporter', 'dot'
]
}

var mochaOpts = {
reporter: 'spec',
require: ['babel-register', 'babel-polyfill'],
require: ['babel-register'],
grep: argv.grep,
invert: argv.invert,
bail: argv.bail,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
"babel-cli": "^6.10.1",
"babel-core": "^6.10.4",
"babel-eslint": "^6.1.2",
"babel-plugin-transform-async-to-generator": "^6.8.0",
"babel-plugin-syntax-async-functions": "^6.8.0",
"babel-plugin-transform-regenerator": "^6.9.0",
"babel-plugin-transform-runtime": "^6.9.0",
"babel-polyfill": "^6.9.1",
"babel-preset-es2015": "^6.9.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.9.0",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/custom.error.promise.wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ exports.config = {
},
onError: function (e) {
browser.lastError = e
return new Promise(function (r) {
setTimeout(r, 2000)
return new Promise(function (resolve) {
setTimeout(resolve, 2000)
})
}
}
1 change: 0 additions & 1 deletion test/fixtures/waitUntil.conf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var path = require('path')

var chai = require('chai')

exports.config = {
Expand Down

0 comments on commit ada03f6

Please sign in to comment.