javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into windows-mode

Browse Source
This commit is contained in:
Brandy Carney
2016-03-03 13:12:52 -05:00
parent 1d95e6c339 a2a9e3846f
commit 62c7199fd1
45 changed files with 558 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -671,12 +671,13 @@ function buildDemoSass(isProductionMode) {
*/
require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig);
// requires bundle.system to be run once
gulp.task('karma', ['tests'], function() {
var karma = require('karma').server;
return karma.start({ configFile: __dirname + '/scripts/karma/karma.conf.js' })
});
gulp.task('karma-watch', function() {
gulp.task('karma-watch', ['tests'], function() {
var karma = require('karma').server;
return karma.start({ configFile: __dirname + '/scripts/karma/karma-watch.conf.js' })
});