@@ -23,7 +23,6 @@ angularFiles = {
2323 'src/service/filter/filters.js' ,
2424 'src/service/filter/limitTo.js' ,
2525 'src/service/filter/orderBy.js' ,
26- 'src/service/formFactory.js' ,
2726 'src/service/interpolate.js' ,
2827 'src/service/location.js' ,
2928 'src/service/log.js' ,
@@ -39,12 +38,29 @@ angularFiles = {
3938 'src/service/http.js' ,
4039 'src/service/httpBackend.js' ,
4140 'src/service/locale.js' ,
42- 'src/directives.js' ,
43- 'src/markups.js' ,
44- 'src/widgets.js' ,
45- 'src/widget/form.js' ,
46- 'src/widget/input.js' ,
47- 'src/widget/select.js'
41+ 'src/directive/directives.js' ,
42+ 'src/directive/a.js' ,
43+ 'src/directive/booleanAttrDirs.js' ,
44+ 'src/directive/form.js' ,
45+ 'src/directive/input.js' ,
46+ 'src/directive/ngBind.js' ,
47+ 'src/directive/ngClass.js' ,
48+ 'src/directive/ngCloak.js' ,
49+ 'src/directive/ngController.js' ,
50+ 'src/directive/ngEventDirs.js' ,
51+ 'src/directive/ngInclude.js' ,
52+ 'src/directive/ngInit.js' ,
53+ 'src/directive/ngNonBindable.js' ,
54+ 'src/directive/ngPluralize.js' ,
55+ 'src/directive/ngRepeat.js' ,
56+ 'src/directive/ngShowHide.js' ,
57+ 'src/directive/ngStyle.js' ,
58+ 'src/directive/ngSwitch.js' ,
59+ 'src/directive/ngTransclude.js' ,
60+ 'src/directive/ngView.js' ,
61+ 'src/directive/script.js' ,
62+ 'src/directive/select.js' ,
63+ 'src/directive/style.js'
4864 ] ,
4965
5066 'angularScenario' : [
@@ -84,7 +100,7 @@ angularFiles = {
84100 'test/*.js' ,
85101 'test/service/*.js' ,
86102 'test/service/filter/*.js' ,
87- 'test/widget /*.js' ,
103+ 'test/directive /*.js' ,
88104 'example/personalLog/test/*.js'
89105 ] ,
90106
@@ -144,7 +160,7 @@ angularFiles = {
144160 'test/jstd-scenario-adapter/*.js' ,
145161 'test/*.js' ,
146162 'test/service/*.js' ,
147- 'test/widget /*.js' ,
163+ 'test/directive /*.js' ,
148164 'example/personalLog/test/*.js'
149165 ] ,
150166
@@ -158,18 +174,18 @@ angularFiles = {
158174// Execute only in slim-jim
159175if ( typeof JASMINE_ADAPTER !== 'undefined' ) {
160176 // SlimJim config
161- files = [ JASMINE_ADAPTER ] ;
177+ files = [ JASMINE , JASMINE_ADAPTER ] ;
162178 angularFiles . jstd . forEach ( function ( pattern ) {
163179 // replace angular source
164180 if ( pattern === '@angularSrc' ) files = files . concat ( angularFiles . angularSrc ) ;
165- // ignore jstd files
166- else if ( ! / j s t d - ( s c e n a r i o - ) ? a d a p t e r / . test ( pattern ) ) files . push ( pattern ) ;
181+ // ignore jstd and jasmine files
182+ else if ( ! / j s t d | j a s m i n e / . test ( pattern ) ) files . push ( pattern ) ;
167183 } ) ;
168184
169185 exclude = angularFiles . jstdExclude ;
170186
171187 autoWatch = true ;
172188 autoWatchInterval = 1 ;
173- logLevel = LOG_ERROR ;
189+ logLevel = LOG_INFO ;
174190 logColors = true ;
175191}
0 commit comments