diff --git a/.travis.yml b/.travis.yml index 64c0ebf..257a4a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,4 @@ language: node_js node_js: - "8" -script: make $COMMAND -env: - matrix: - - COMMAND=test - #- COMMAND=test-browser - global: - - secure: FsU9623CV4X1G3WHvq2H0XHjDYxvfSMdWdKrAuTSZB9TsJlQ0UAIKbHNBzxSBo6/1xv1ZYyuPZvJnrkHAqNOVGYr0MiIINPt0jDmM3anl03lbaVwwpWcwxgslFGbfVufKKKrYAPF0UDS6uNeZtYP4fs2xlao7F9BaanpARiK5TY= - - secure: PZeRlTvq67EBo1yXthMK2bKeCn5fVA3qCtFZ0m38XZDi8cj6wfXaLGoELrrtSNGFhZt2xU0DLQ+w0y2vC+gTOzWqbAw1Cedri97c514oX+QFvDqRKCbrKkGR9DHW6jUxOL1YrSfto21+CEsZEcQsYBTYFwnAKxmT3UIXCCgU+JI= sudo: false diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index e1c0acc..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,82 +0,0 @@ -'use strict'; - - -module.exports = function (grunt) { - var browsers = [ { - browserName: 'iphone', - platform: 'OS X 10.8', - version: '8.1' - }, { - browserName: 'android', - platform: 'Linux', - version: '5.1' - }, { - browserName: 'firefox', - platform: 'XP', - version: '35' - }, { - browserName: 'chrome', - platform: 'XP', - version: '41' - }, { - browserName: 'internet explorer', - platform: 'WIN7', - version: '11' - }, { - browserName: 'internet explorer', - platform: 'WIN7', - version: '10' - }, { - browserName: 'internet explorer', - platform: 'WIN7', - version: '9' - }, { - browserName: 'internet explorer', - platform: 'WIN7', - version: '8' - /*}, { - browserName: 'internet explorer', - platform: 'XP', - version: '7' - }, { - browserName: 'internet explorer', - platform: 'XP', - version: '6'*/ - }, { - browserName: 'safari', - platform: 'OS X 10.8', - version: '6' - } ]; - - - grunt.initConfig({ - connect: { - server: { - options: { - base: '', - port: 9999 - } - } - }, - 'saucelabs-mocha': { - all: { - options: { - urls: [ 'http://127.0.0.1:9999/test/browser/test.html' ], - build: process.env.TRAVIS_JOB_NUMBER || ('local' + ~~(Math.random() * 1000)), - browsers: browsers, - throttled: 3, - testname: process.env.SAUCE_PROJ || 'mocha tests' - } - } - }, - watch: {} - }); - - // Loading dependencies - for (var key in grunt.file.readJSON('package.json').devDependencies) { - if (key !== 'grunt' && key.indexOf('grunt') === 0) { grunt.loadNpmTasks(key); } - } - - //grunt.registerTask('dev', ['connect', 'watch']); - grunt.registerTask('test', [ 'connect', 'saucelabs-mocha' ]); -}; diff --git a/Makefile b/Makefile index 475d6fd..b26966b 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,6 @@ lint: test: lint ./node_modules/.bin/mocha -test-browser: lint - rm -f ./test/browser/pako.js - ./node_modules/.bin/browserify -r ./ -s pako > test/browser/pako.js - @SAUCE_PROJ=${GITHUB_PROJ} grunt test - cover: rm -rf cover ./node_modules/.bin/istanbul cover node_modules/.bin/_mocha diff --git a/package.json b/package.json index b8ff3a7..174cb27 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,6 @@ "bluebird": "^3.5.0", "browserify": "^14.4.0", "eslint": "^3.12.2", - "grunt": "^1.0.1", - "grunt-cli": "^1.2.0", - "grunt-contrib-connect": "^1.0.2", - "grunt-saucelabs": "^9.0.0", "istanbul": "^0.4.5", "mocha": "^3.2.0", "multiparty": "^4.1.3",