From fecbcf34fe28ef457e18ae6d21de8cc723702062 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Sun, 22 Mar 2015 13:41:13 -0400 Subject: [PATCH] remove unused frameworks --- auto_tests/karma.conf.js | 6 +----- auto_tests/tests/callback.js | 2 +- auto_tests/tests/custom_bars.js | 4 ++-- auto_tests/tests/range_selector.js | 6 +++--- gulpfile.js | 11 +---------- package.json | 3 +-- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/auto_tests/karma.conf.js b/auto_tests/karma.conf.js index 4349239..2505677 100644 --- a/auto_tests/karma.conf.js +++ b/auto_tests/karma.conf.js @@ -3,11 +3,7 @@ module.exports = function (config) { basePath: '../', frameworks: [ 'mocha', - 'chai', - 'chai-as-promised', - 'sinon-chai', - 'chai-things', - 'dirty-chai' + 'chai' ], files: [ 'dist/dygraph-combined.dev.js', diff --git a/auto_tests/tests/callback.js b/auto_tests/tests/callback.js index 142fa88..b10cf16 100644 --- a/auto_tests/tests/callback.js +++ b/auto_tests/tests/callback.js @@ -539,7 +539,7 @@ it('testFailedResponse', function() { DygraphOps.dispatchMouseOut_Point(g, 800, 800); // This call should not throw an exception. - assert.isFalse("exception thrown during mouseout", failed); + assert.isFalse(failed, "exception thrown during mouseout"); }); diff --git a/auto_tests/tests/custom_bars.js b/auto_tests/tests/custom_bars.js index 1107c9e..523d93a 100644 --- a/auto_tests/tests/custom_bars.js +++ b/auto_tests/tests/custom_bars.js @@ -77,8 +77,8 @@ it('testCustomBarsZero', function() { var g = new Dygraph(graph, data, opts); var range = g.yAxisRange(); - assert.isTrue('y-axis must include 0', range[0] <= 0); - assert.isTrue('y-axis must include 5', range[1] >= 5); + assert.isTrue(range[0] <= 0, 'y-axis must include 0'); + assert.isTrue(range[1] >= 5, 'y-axis must include 5'); }); // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=229 diff --git a/auto_tests/tests/range_selector.js b/auto_tests/tests/range_selector.js index b04cbb5..933cacf 100644 --- a/auto_tests/tests/range_selector.js +++ b/auto_tests/tests/range_selector.js @@ -288,7 +288,7 @@ it('testRangeSelectorInteraction', function() { zoomhandles[0].dispatchEvent(mouseUpEvent); var newXRange = g.xAxisRange().slice(); - assert('left zoomhandle should have moved: '+newXRange[0]+'>'+xRange[0], newXRange[0] > xRange[0]); + assert(newXRange[0] > xRange[0], 'left zoomhandle should have moved: '+newXRange[0]+'>'+xRange[0]); assert.equal(xRange[1], newXRange[1], 'right zoomhandle should not have moved'); // Move right zoomhandle in @@ -353,8 +353,8 @@ it('testRangeSelectorInteraction', function() { fgcanvas.dispatchEvent(mouseUpEvent); var newXRange = g.xAxisRange().slice(); - assert(newXRange[0]+'<'+xRange[0], newXRange[0] < xRange[0]); - assert(newXRange[1]+'<'+xRange[1], newXRange[1] < xRange[1]); + assert(newXRange[0] < xRange[0], newXRange[0]+'<'+xRange[0]); + assert(newXRange[1] < xRange[1], newXRange[1]+'<'+xRange[1]); }); diff --git a/gulpfile.js b/gulpfile.js index f842bf7..646c7a3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,6 @@ var gulp = require('gulp'); var plugins = require('gulp-load-plugins')(); var karma = require('karma').server; -var lazypipe = require('lazypipe'); var path = require('path'); var dev = false; @@ -127,14 +126,6 @@ gulp.task('concat', function() { }); -gulp.task("bower-dist", ['concat'], function() { - gulp.src('src/dygraph/extras/**', {base: 'src/dygraph'}) - .pipe(gulp.dest('dist/bower')); - - return gulp.src('dist/dygraph-combined*') - .pipe(gulp.dest('dist/bower')); -}); - gulp.task('gwt-dist', ['concat'], function() { // Copy package structure to dist folder gulp.src('gwt/**', {'base': '.'}) @@ -172,6 +163,6 @@ gulp.task('watch-test', function() { gulp.watch(['src/**', 'auto_tests/tests/**'], ['test']); }); -gulp.task('dist', ['gwt-dist', 'bower-dist']); +gulp.task('dist', ['gwt-dist', 'concat']); gulp.task('travis', ['test', 'coveralls']); gulp.task('default', ['test', 'dist']); diff --git a/package.json b/package.json index 397a5f6..de85acc 100644 --- a/package.json +++ b/package.json @@ -40,14 +40,13 @@ "gulp-uglify": "^1.0.2", "jshint": "^2.5.10", "karma": "^0.12.31", - "karma-chai-plugins": "git+https://github.com/cthrax/karma-chai-plugins.git#c44bd9c2026bcbaf5bb56a9ee35a13d216e44d20", + "karma-chai-plugins": "^0.2.4", "karma-chrome-launcher": "^0.1.7", "karma-coverage": "^0.2.7", "karma-mocha": "^0.1.10", "karma-mocha-reporter": "^1.0.2", "karma-phantomjs-launcher": "^0.1.4", "karma-spec-reporter": "0.0.16", - "lazypipe": "^0.2.2", "lcov-parse": "0.0.9", "mocha": "^2.1.0", "obvious-closure-library": "^20140401.0.2", -- 2.7.4