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

fix(tests): Execute the security specs only once

This commit is contained in:
Victor Berchet 2016-05-20 11:41:42 -07:00
parent f95a604b59
commit 9634e8d14a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/cjs-jasmine/index.ts
View File

@ -33,7 +33,7 @@ if (globsIndex < 0) {
var specFiles: any = var specFiles: any =
args.map(function(globstr: string): string[] { args.map(function(globstr: string): string[] {
var tests: string[] = glob.sync(globstr, { return glob.sync(globstr, {
cwd: distAll, cwd: distAll,
ignore: [ ignore: [
// the following code and tests are not compatible with CJS/node environment // the following code and tests are not compatible with CJS/node environment
@ -50,11 +50,9 @@ var specFiles: any =
'payload_tests/**' 'payload_tests/**'
] ]
}); });
// The security spec however works (and must work!) on the server side.
tests = tests.concat(
glob.sync('@angular/platform-browser/test/security/**/*_spec.js', {cwd: distAll}));
return tests;
}) })
// The security spec however works (and must work!) on the server side.
.concat(glob.sync('@angular/platform-browser/test/security/**/*_spec.js', {cwd: distAll}))
.reduce((specFiles: string[], paths: string[]) => specFiles.concat(paths), <string[]>[]); .reduce((specFiles: string[], paths: string[]) => specFiles.concat(paths), <string[]>[]);
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100; jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;