iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(testing): update karma-jasmine and jasmine 

Jasmine to jasmine-core 2.3.4.
Update tools tests using minijasminenode to directly use jasmine.

See #1860
This commit is contained in:
Julie Ralph 2015-05-20 16:07:47 -07:00
parent b6b52e62b2
commit 863eb3c559
5 changed files with 100 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/test_lib/test_lib.es6
View File

@ -31,10 +31,10 @@ export class AsyncTestCompleter {
var jsmBeforeEach = _global.beforeEach;
var jsmDescribe = _global.describe;
var jsmDDescribe = _global.ddescribe;
var jsmDDescribe = _global.fdescribe;
var jsmXDescribe = _global.xdescribe;
var jsmIt = _global.it;
var jsmIIt = _global.iit;
var jsmIIt = _global.fit;
var jsmXIt = _global.xit;
var runnerStack = [];

40
npm-shrinkwrap.clean.json
View File

@ -6933,6 +6933,36 @@
}
}
},
"jasmine": {
"version": "2.3.1",
"dependencies": {
"exit": {
"version": "0.1.2"
},
"glob": {
"version": "3.2.11",
"dependencies": {
"inherits": {
"version": "2.0.1"
},
"minimatch": {
"version": "0.3.0",
"dependencies": {
"lru-cache": {
"version": "2.6.4"
},
"sigmund": {
"version": "1.0.1"
}
}
}
}
}
}
},
"jasmine-core": {
"version": "2.3.4"
},
"js-beautify": {
"version": "1.5.5",
"dependencies": {
@ -7593,7 +7623,7 @@
}
},
"karma-jasmine": {
"version": "0.2.3"
"version": "0.3.5"
},
"lodash": {
"version": "2.4.2"
@ -7774,14 +7804,6 @@
"merge2": {
"version": "0.3.5"
},
"minijasminenode2": {
"version": "1.0.0",
"dependencies": {
"jasmine-core": {
"version": "2.0.0"
}
}
},
"minimatch": {
"version": "2.0.7",
"dependencies": {

64
npm-shrinkwrap.json generated
View File

@ -10712,6 +10712,52 @@
}
}
},
"jasmine": {
"version": "2.3.1",
"from": "jasmine@2.3.1",
"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.3.1.tgz",
"dependencies": {
"exit": {
"version": "0.1.2",
"from": "exit@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
},
"glob": {
"version": "3.2.11",
"from": "glob@>=3.2.11 <4.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
"from": "inherits@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"minimatch": {
"version": "0.3.0",
"from": "minimatch@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
"dependencies": {
"lru-cache": {
"version": "2.6.4",
"from": "lru-cache@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
},
"sigmund": {
"version": "1.0.1",
"from": "sigmund@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
}
}
}
}
}
}
},
"jasmine-core": {
"version": "2.3.4",
"from": "jasmine-core@2.3.4",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz"
},
"js-beautify": {
"version": "1.5.5",
"from": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.5.5.tgz",
@ -11726,9 +11772,9 @@
}
},
"karma-jasmine": {
"version": "0.2.3",
"from": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.2.3.tgz",
"resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.2.3.tgz"
"version": "0.3.5",
"from": "karma-jasmine@0.3.5",
"resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.3.5.tgz"
},
"lodash": {
"version": "2.4.2",
@ -12007,18 +12053,6 @@
"from": "https://registry.npmjs.org/merge2/-/merge2-0.3.5.tgz",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-0.3.5.tgz"
},
"minijasminenode2": {
"version": "1.0.0",
"from": "https://registry.npmjs.org/minijasminenode2/-/minijasminenode2-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/minijasminenode2/-/minijasminenode2-1.0.0.tgz",
"dependencies": {
"jasmine-core": {
"version": "2.0.0",
"from": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.0.0.tgz"
}
}
},
"minimatch": {
"version": "2.0.7",
"from": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",

5
package.json
View File

@ -78,19 +78,20 @@
"gulp-webserver": "^0.8.7",
"html2jade": "^0.8.3",
"indent-string": "^1.2.1",
"jasmine": "2.3.1",
"jasmine-core": "2.3.4",
"js-beautify": "^1.5.5",
"js-yaml": "^3.2.7",
"karma": "^0.12.23",
"karma-chrome-launcher": "^0.1.4",
"karma-cli": "^0.0.4",
"karma-dart": "^0.2.8",
"karma-jasmine": "^0.2.2",
"karma-jasmine": "^0.3.5",
"lodash": "^2.4.1",
"madge": "^0.5.0",
"marked": "^0.3.3",
"merge": "^1.2.0",
"merge2": "^0.3.5",
"minijasminenode2": "^1.0.0",
"minimatch": "^2.0.1",
"minimist": "1.1.x",
"mock-fs": "^2.5.0",

24
tools/traceur-jasmine/index.js
View File

@ -1,12 +1,14 @@
'use strict';
var glob = require('glob');
var minijasminenode2 = require('minijasminenode2');
var JasmineRunner = require('jasmine');
var path = require('path');
// Require traceur to exposes $traceurRuntime on global context so that CJS files can run
require('traceur/bin/traceur-runtime.js');
require('reflect-metadata/Reflect');
var jrunner = new JasmineRunner();
// Support passing multiple globs
var globsIndex = process.argv.indexOf('--');
var args;
@ -20,12 +22,16 @@ var specFiles = args.
map(function(globstr) { return glob.sync(globstr); }).
reduce(function(specFiles, paths) { return specFiles.concat(paths); }, []);
minijasminenode2.executeSpecs({
includeStackTrace: true,
defaultTimeoutInterval: 1000,
showColors: process.argv.indexOf('--no-color') === -1,
specs: specFiles,
onComplete: function(passed) {
process.exit(passed ? 0 : 1);
}
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
jrunner.configureDefaultReporter({
showColors: process.argv.indexOf('--no-color') === -1
});
jrunner.onComplete(function(passed) {
process.exit(passed ? 0 : 1);
});
jrunner.projectBaseDir = path.resolve(__dirname, '../../');
jrunner.specDir = '';
jrunner.addSpecFiles(specFiles);
jrunner.execute();