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

chore(): update karma tests to work with npm3

Browse Source
This commit is contained in:
Tim Lancina
2016-03-02 13:57:09 -06:00
parent 8bbd1380ca
commit cbe9ed8c23
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gulpfile.js
View File

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

1
package.json
View File

@ -58,6 +58,7 @@
"html-entities": "^1.1.3", "html-entities": "^1.1.3",
"htmlparser2": "^3.8.3", "htmlparser2": "^3.8.3",
"ionic-cz-conventional-changelog": "^1.0.0", "ionic-cz-conventional-changelog": "^1.0.0",
"jasmine-core": "^2.4.1",
"jasmine-node": "^1.14.5", "jasmine-node": "^1.14.5",
"js-yaml": "^3.4.2", "js-yaml": "^3.4.2",
"karma": "^0.12.31", "karma": "^0.12.31",

5
scripts/karma/karma.conf.js
View File

@ -1,5 +1,7 @@
var buildConfig = require('../build/config'); var buildConfig = require('../build/config');
module.exports = function(config) { module.exports = function(config) {
config.set({ config.set({
singleRun: true, singleRun: true,
@ -8,7 +10,8 @@ module.exports = function(config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: [ files: [
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js', 'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js', //npm2
'node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm3
'node_modules/systemjs/dist/system.js', 'node_modules/systemjs/dist/system.js',
'scripts/karma/system.config.js', 'scripts/karma/system.config.js',
'node_modules/angular2/bundles/angular2-polyfills.min.js', 'node_modules/angular2/bundles/angular2-polyfills.min.js',