From 86702ee7a4bb45c303262465459d56bbb290942b Mon Sep 17 00:00:00 2001 From: Enrico Stara Date: Wed, 12 Nov 2014 19:23:37 +0100 Subject: [PATCH] Add browsers test with zuul in CI --- .travis.yml | 7 ++++++- .zuul.yml | 8 ++++++-- gulpfile.js | 4 ++-- package.json | 4 +++- test/telegram.link.test.js | 4 ++-- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4340ff7..8ee61e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,9 @@ language: node_js node_js: - "0.10" after_script: - - npm run coveralls \ No newline at end of file + - npm run zuul + - npm run coveralls +env: + global: + - secure: G6N8h4CcxUNIcFUStnx7faP1ZYo9mu6hWdfaE6Cg1EE/Kzas+0Fa/0L/KZC7K+Do/6pBL7K+b00Jz14OhAuejEaGQEgCZ5yEp3cR5zmk1RjCkFDihBvus18omV2k3fmQCi3cDv/xms5eJU3UZfHGkEqMEGGcmKcl6hpS8qBX29g= + - secure: KJFFEOXAljZ4Em2ESpjqoCnOIld7KBa4hWSx2Hx4Q2DdgzGUZDh410oOlyStXhLXb2y5gDvSmRoEHCtc0uMdkv6XDb/SkNGqsoiG2gLX/xUXM2UR4dQ5yDFxgItMaVyur2YGaifTxnzi2fDVYXyjVG4vuqEq0XfAFXmBrooh6Q== diff --git a/.zuul.yml b/.zuul.yml index 4348e47..f300b55 100644 --- a/.zuul.yml +++ b/.zuul.yml @@ -5,6 +5,10 @@ browsers: - name: ie version: 9..latest - name: firefox - version: 25..latest + version: 30..latest - name: safari - version: 6..latest \ No newline at end of file + version: 6..latest + - name: android + version: 4.2..latest + - name: iphone + version: 7.0..latest \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 0785df9..6396da3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,11 +25,11 @@ gulp.task('quality-api', function () { gulp.task('test-lib', function () { return gulp.src('./test/lib/**/*.js') - .pipe(mocha({reporter: 'tap', timeout: '10s'})); + .pipe(mocha({reporter: 'mocha-better-spec-reporter', timeout: '10s'})); }); gulp.task('test-api', function () { return gulp.src('./test/*.js') - .pipe(mocha({reporter: 'tap', timeout: '10s'})); + .pipe(mocha({reporter: 'mocha-better-spec-reporter', timeout: '10s'})); }); gulp.task('cov-test-lib', function () { diff --git a/package.json b/package.json index ff336b5..413eb6d 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "istanbul": "latest", "mocha": "latest", "mocha-lcov-reporter": "latest", + "mocha-better-spec-reporter": "latest", "should": "latest", "zuul": "latest" }, @@ -44,6 +45,7 @@ }, "scripts": { "test": "gulp test", - "coveralls": "istanbul cover ./node_modules/gulp/bin/gulp.js cover && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage" + "coveralls": "istanbul cover ./node_modules/gulp/bin/gulp.js cover && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage", + "zuul": "zuul -- ./test/lib/type-language/** ./test/lib/crypto-util/**" } } diff --git a/test/telegram.link.test.js b/test/telegram.link.test.js index d836075..bebe780 100644 --- a/test/telegram.link.test.js +++ b/test/telegram.link.test.js @@ -21,8 +21,8 @@ describe('TelegramLink', function () { describe('#authorization()', function () { it('should returns', function (done) { - this.timeout(30000); - require('get-log').enable('*'); + this.timeout(120000); +// require('get-log').enable('*'); var telegramLink = new TelegramLink(primaryDC); telegramLink.connect(function (e) { if(e) {