Merge pull request #54 from edx/fix-karma-hang

Fix issues with karma hanging on exit
openedx · Apr 6, 2016 · cc2e77d · cc2e77d
2 parents 9759688 + 3258744
commit cc2e77d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/gulp/tasks/jscs.js b/gulp/tasks/jscs.js
@@ -5,7 +5,7 @@
         gulp = require('gulp'),
         paths = {
             lint: [
-                'test/**/*.js',
+                'test/**/!(jquery.simulate)*.js',
                 'components/**/*.js',
                 'gulp/tasks/*.js',
                 'gulpfile.js'

diff --git a/gulp/tasks/lint.js b/gulp/tasks/lint.js
@@ -5,7 +5,7 @@
         gulp = require('gulp'),
         paths = {
             lint: [
-                'test/**/*.js',
+                'test/**/!(jquery.simulate)*.js',
                 'components/**/*.js',
                 'gulp/tasks/*.js',
                 'gulpfile.js'

diff --git a/package.json b/package.json
@@ -13,6 +13,9 @@
     "javascript"
   ],
   "homepage": "https://github.com/edx/edx-ui-toolkit",
+  "scripts": {
+    "test": "gulp test"
+  },
   "dependencies": {
     "backbone": "~1.2.3",
     "backbone.paginator": "~2.0.3",
@@ -29,7 +32,6 @@
     "gulp-coveralls": "~0.1.4",
     "gulp-jscs": "~3.0.2",
     "gulp-jshint": "~2.0.0",
-    "gulp-karma": "~0.0.5",
     "gulp-util": "~3.0.7",
     "jasmine": "~2.4.1",
     "jasmine-core": "~2.4.1",

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -83,8 +83,7 @@ module.exports = function(config, options) {
             reporters: [
                 {type: 'html', subdir: 'coverage-js/html'},
                 {type: 'cobertura', file: 'coverage.xml'},
-                {type: 'lcov', dir: 'coverage/'},
-                {type: 'text-summary'}
+                {type: 'lcov', dir: 'coverage/'}
             ]
         },