@@ -10,19 +10,19 @@ module.exports = function(config) {
10
10
basePath : '../' ,
11
11
12
12
// frameworks to use
13
- frameworks : [ 'jasmine2 ' ] ,
13
+ frameworks : [ 'jasmine ' ] ,
14
14
15
- // list of files / patterns to load in the browser (we add more dynamically in our tasks)
15
+ // list of files / patterns to load in the browser
16
+ // note that the karmangular setup from util.createKarmangularConfig seems
17
+ // to take precedence over this, but we can't remove this because then
18
+ // the karmangular task doesn't appear to run. So includes the features/**/test, but
19
+ // they don't get run if you've used the --fast or --core options
16
20
files : [
17
21
'bower_components/jquery/jquery.min.js' ,
18
22
'lib/test/jquery.simulate.js' ,
19
23
'lib/test/classList.polyFill.js' ,
20
24
'bower_components/lodash/dist/lodash.min.js' ,
21
25
22
- 'lib/test/angular/1.5.0/angular.js' ,
23
- 'lib/test/angular/1.5.0/angular-mocks.js' ,
24
- 'lib/test/angular/1.5.0/angular-animate.js' ,
25
-
26
26
'src/js/core/bootstrap.js' ,
27
27
'src/js/**/*.js' ,
28
28
'src/features/**/js/**/*.js' ,
@@ -31,22 +31,13 @@ module.exports = function(config) {
31
31
32
32
'dist/release/ui-grid.css' ,
33
33
34
- '.tmp/template.js' //templates
34
+ '.tmp/template.js' // templates
35
35
] ,
36
36
37
- // Ensures that font files do not cause a 404 error
38
- proxies : {
39
- '/base/dist/release/ui-grid.woff' : 'src/font/ui-grid.woff' ,
40
- '/base/dist/release/ui-grid.ttf' : 'src/font/ui-grid.ttf' ,
41
- '/base/dist/release/ui-grid.svg' : 'src/font/ui-grid.svg'
42
- } ,
43
-
44
-
45
37
// list of files to exclude
46
38
exclude : [
47
39
] ,
48
40
49
-
50
41
// test results reporter to use
51
42
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
52
43
reporters : [ 'dots' , 'coverage' ] ,
@@ -72,7 +63,7 @@ module.exports = function(config) {
72
63
73
64
// level of logging
74
65
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
75
- logLevel : config . LOG_INFO ,
66
+ logLevel : config . LOG_DEBUG ,
76
67
77
68
78
69
// enable / disable watching file and executing tests whenever any file changes
@@ -117,7 +108,7 @@ module.exports = function(config) {
117
108
// TODO(c0bra): remove once SauceLabs supports websockets.
118
109
// This speeds up the capturing a bit, as browsers don't even try to use websocket. -- (thanks vojta)
119
110
if ( process . env . TRAVIS ) {
120
- config . logLevel = config . LOG_INFO ;
111
+ config . logLevel = config . LOG_DEBUG ;
121
112
config . browserNoActivityTimeout = 120000 ; // NOTE: from angular.js, for socket.io buffer
122
113
config . reporters = [ 'dots' , 'coverage' ] ;
123
114
0 commit comments