Skip to content

Commit

Permalink
Update .travis.yml, use standard, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
fanatid committed Nov 18, 2015
1 parent ec12061 commit c126511
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 24 deletions.
10 changes: 0 additions & 10 deletions .eslintrc

This file was deleted.

20 changes: 13 additions & 7 deletions .travis.yml
@@ -1,16 +1,22 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.11"
- "0.12"
- "4"
- "5"
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- npm install
env:
- TEST_SUITE=coveralls
- TEST_SUITE=lint
- TEST_SUITE=test
script: "npm run $TEST_SUITE"
global:
- DISPLAY=:99.0
matrix:
- TEST_SUITE=test
matrix:
include:
- node_js: "4"
env: TEST_SUITE=coveralls
- node_js: "4"
env: TEST_SUITE=lint
script: npm run $TEST_SUITE
24 changes: 17 additions & 7 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "sync-mixin",
"version": "1.0.0",
"description": "Emit events in classes about sync",
"version": "1.0.1",
"description": "Emit events about sync",
"keywords": [
"syncing",
"mixin"
Expand Down Expand Up @@ -32,7 +32,7 @@
"coverage": "istanbul cover _mocha -- --compilers js:babel/register test/*.js",
"coveralls": "npm run coverage && coveralls <coverage/lcov.info",
"clean": "rm -f lib/*",
"lint": "eslint src test",
"lint": "standard",
"test": "npm run test:node && npm run test:browser",
"test:browser": "karma start karma.conf.js",
"test:node": "istanbul test mocha -- --compilers js:babel/register --reporter spec test/*.js"
Expand All @@ -48,16 +48,26 @@
"chai": "^3.4.0",
"core-decorators": "^0.8.1",
"coveralls": "^2.11.4",
"eslint": "^1.7.3",
"eslint-config-standard": "^4.4.0",
"eslint-plugin-standard": "^1.2.0",
"istanbul": "^0.4.0",
"karma": "^0.13.14",
"karma-browserify": "^4.4.0",
"karma-chrome-launcher": "^0.2.1",
"karma-detect-browsers": "^2.0.2",
"karma-firefox-launcher": "^0.1.6",
"karma-mocha": "^0.2.0",
"mocha": "^2.3.3"
"mocha": "^2.3.3",
"standard": "^5.3.1"
},
"engines": {
"node": ">=0.10"
},
"standard": {
"globals": [
"describe",
"beforeEach",
"afterEach",
"it"
],
"parser": "babel-eslint"
}
}

0 comments on commit c126511

Please sign in to comment.