Skip to content

Commit

Permalink
WORKING: Remove grunt-karma
Browse files Browse the repository at this point in the history
  • Loading branch information
1ambda committed Dec 28, 2016
1 parent ea7f186 commit 7aed1bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 17 deletions.
15 changes: 1 addition & 14 deletions zeppelin-web/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ module.exports = function(grunt) {
presets: ['es2015'],
plugins: ['transform-object-rest-spread']
},
dev: {
files: [{
expand: true,
cwd: './src/',
src: ['**/*.js'],
dest: '.tmp',
}]
},
dist: {
files: [{
expand: true,
Expand Down Expand Up @@ -600,10 +592,6 @@ module.exports = function(grunt) {
]);
});

grunt.registerTask('test', [
'karma'
]);

grunt.registerTask('build', [
'jscs',
'eslint',
Expand All @@ -625,7 +613,6 @@ module.exports = function(grunt) {
]);

grunt.registerTask('default', [
'build',
'test'
'build'
]);
};
3 changes: 1 addition & 2 deletions zeppelin-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postinstall": "bower install --silent && grunt googlefonts",
"build": "grunt build",
"start": "grunt prepare-webpack && webpack-dev-server --port 9000 --history-api-fallback --inline --progress",
"test": "grunt test",
"test": "karma start test/karma.conf.js",
"pretest": "npm install karma-phantomjs-launcher"
},
"dependencies": {
Expand Down Expand Up @@ -46,7 +46,6 @@
"grunt-google-fonts": "^0.4.0",
"grunt-htmlhint": "^0.9.13",
"grunt-jscs": "^2.1.0",
"grunt-karma": "~2.0.0",
"grunt-newer": "^0.7.0",
"grunt-ng-annotate": "^0.10.0",
"grunt-postcss": "^0.7.1",
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web/test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module.exports = function(config) {

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false,
singleRun: true,

colors: true,

Expand Down

0 comments on commit 7aed1bc

Please sign in to comment.