This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree 2 files changed +14
-6
lines changed
2 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -191,7 +191,7 @@ var angularFiles = {
191
191
192
192
'karmaModulesBase' : [
193
193
'build/angular.js' ,
194
- 'src/ngMock/* .js' ,
194
+ 'build/angular-mocks .js' ,
195
195
'test/modules/no_bootstrap.js' ,
196
196
'test/helpers/matchers.js' ,
197
197
'test/helpers/privateMocks.js' ,
@@ -230,9 +230,15 @@ var angularFiles = {
230
230
'test/ngMessages/**/*.js'
231
231
] ,
232
232
233
+ // ngMock doesn't include the base because it must use the ngMock src files
233
234
'karmaModules-ngMock' : [
234
- '@karmaModulesBase' ,
235
- 'build/angular-resource.js' ,
235
+ 'build/angular.js' ,
236
+ 'src/ngMock/*.js' ,
237
+ 'test/modules/no_bootstrap.js' ,
238
+ 'test/helpers/matchers.js' ,
239
+ 'test/helpers/privateMocks.js' ,
240
+ 'test/helpers/support.js' ,
241
+ 'test/helpers/testabilityPatch.js' ,
236
242
'src/routeToRegExp.js' ,
237
243
'build/angular-animate.js' ,
238
244
'test/ngMock/**/*.js'
Original file line number Diff line number Diff line change @@ -1109,11 +1109,13 @@ describe('ngMock', function() {
1109
1109
var mock = { log : 'module' } ;
1110
1110
1111
1111
beforeEach ( function ( ) {
1112
+ angular . module ( 'stringRefModule' , [ ] ) . service ( 'stringRef' , function ( ) { } ) ;
1113
+
1112
1114
module ( {
1113
1115
'service' : mock ,
1114
1116
'other' : { some : 'replacement' }
1115
1117
} ,
1116
- 'ngResource ' ,
1118
+ 'stringRefModule ' ,
1117
1119
function ( $provide ) { $provide . value ( 'example' , 'win' ) ; }
1118
1120
) ;
1119
1121
} ) ;
@@ -1132,9 +1134,9 @@ describe('ngMock', function() {
1132
1134
} ) ;
1133
1135
1134
1136
it ( 'should integrate with string and function' , function ( ) {
1135
- inject ( function ( service , $resource , example ) {
1137
+ inject ( function ( service , stringRef , example ) {
1136
1138
expect ( service ) . toEqual ( mock ) ;
1137
- expect ( $resource ) . toBeDefined ( ) ;
1139
+ expect ( stringRef ) . toBeDefined ( ) ;
1138
1140
expect ( example ) . toEqual ( 'win' ) ;
1139
1141
} ) ;
1140
1142
} ) ;
You can’t perform that action at this time.
0 commit comments