diff --git a/package.json b/package.json index ea40c32f3427f48bac99043df1ca177321e69277..8534e320fc12efaf353bc5ba7a3d9cbdfb96c0a6 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,9 @@ "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js \"assets/js/src/*.js\"", - "js-test": "cross-env USE_OLD_JQUERY=true karma start js/tests/karma.conf.js && karma start js/tests/karma.conf.js", + "js-test": "npm-run-all --parallel js-test-karma*", + "js-test-karma": "karma start js/tests/karma.conf.js", + "js-test-karma-old": "cross-env USE_OLD_JQUERY=true npm run js-test-karma", "js-test-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & node build/saucelabs-unit-test.js", "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint", "docs-compile": "bundle exec jekyll build",