File tree 6 files changed +34
-12
lines changed
6 files changed +34
-12
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,8 @@ module.exports = function(config) {
12
12
13
13
preprocessors : {
14
14
'tmp/app/**/!(*.spec)+(.js)' : [ 'coverage' ] ,
15
- 'tmp/app/**/*.js' : [ 'sourcemap' ]
15
+ 'tmp/app/**/*.js' : [ 'sourcemap' ] ,
16
+ 'tmp/test/**/*.js' : [ 'sourcemap' ]
16
17
} ,
17
18
18
19
// Generate json used for remap-istanbul
@@ -34,6 +35,7 @@ module.exports = function(config) {
34
35
'node_modules/zone.js/dist/fake-async-test.js' ,
35
36
'node_modules/systemjs/dist/system.src.js' ,
36
37
38
+ 'tmp/test/test-helpers/global/**/*.js' ,
37
39
'systemjs.conf.js' ,
38
40
'karma-test-shim.js' ,
39
41
Original file line number Diff line number Diff line change
1
+ declare module jasmine {
2
+ interface Matchers {
3
+ toContainText ( text : string ) : boolean ;
4
+ }
5
+ }
Original file line number Diff line number Diff line change 6
6
7
7
( function ( global ) {
8
8
// ENV
9
- global . ENV = 'development'
9
+ global . ENV = global . ENV || 'development' ;
10
10
11
11
// wildcard paths
12
12
var paths = {
35
35
}
36
36
} ;
37
37
38
+ // Add package entries for angular packages
39
+ var ngPackageNames = [
40
+ 'common' ,
41
+ 'compiler' ,
42
+ 'core' ,
43
+ 'http' ,
44
+ 'platform-browser' ,
45
+ 'platform-browser-dynamic' ,
46
+ 'router'
47
+ ] ;
48
+
49
+ // add package entries for packages that expose barrels using index.js
38
50
var packageNames = [
39
- '@angular/common' ,
40
- '@angular/compiler' ,
41
- '@angular/core' ,
42
- '@angular/http' ,
43
- '@angular/platform-browser' ,
44
- '@angular/platform-browser-dynamic' ,
45
- '@angular/router' ,
46
- '@angular/testing' ,
47
51
'lodash'
48
52
] ;
49
53
50
- // add package entries for angular packages in the form '@angular/common': { main: 'index.js', defaultExtension: 'js' }
54
+ ngPackageNames . forEach ( function ( pkgName ) {
55
+ var main = global . ENV === 'testing' ? 'index.js' :
56
+ pkgName + '.umd.js' ;
57
+
58
+ packages [ '@angular/' + pkgName ] = { main : main , defaultExtension : 'js' } ;
59
+ } ) ;
60
+
51
61
packageNames . forEach ( function ( pkgName ) {
52
62
packages [ pkgName ] = { main : 'index.js' , defaultExtension : 'js' } ;
53
63
} ) ;
Original file line number Diff line number Diff line change @@ -6,7 +6,8 @@ var sourcemaps = require('gulp-sourcemaps');
6
6
7
7
/* Initialize TS Project */
8
8
var typingFiles = [
9
- 'typings/index.d.ts'
9
+ 'typings/index.d.ts' ,
10
+ 'manual_typings/**/*.d.ts'
10
11
] ;
11
12
var tsUnitFiles = [ ] . concat ( config . tsTestFiles . unit , config . tsTestFiles . helper ) ;
12
13
var tsE2EFiles = [ ] . concat ( config . tsTestFiles . e2e , config . tsTestFiles . helper ) ;
Original file line number Diff line number Diff line change
1
+ // This lets systemjs.conf.js knows how to load the module during testing
2
+ ( ( global ) => {
3
+ global . ENV = 'testing' ;
4
+ } ) ( this ) ;
File renamed without changes.
You can’t perform that action at this time.
0 commit comments