@@ -1219,13 +1219,13 @@ describe('$compile', function() {
1219
1219
{
1220
1220
'no root element' : 'dada' ,
1221
1221
'multiple root elements' : '<div></div><div></div>'
1222
- } , function ( $prop ) {
1222
+ } , function ( directiveTemplate ) {
1223
1223
1224
- inject ( function ( $compile , $templateCache , $rootScope ) {
1225
- templateVar = $prop ;
1224
+ inject ( function ( $compile ) {
1225
+ templateVar = directiveTemplate ;
1226
1226
expect ( function ( ) {
1227
1227
$compile ( '<p template></p>' ) ;
1228
- } ) . toThrowMinErr ( '$compile' , 'tplrt' , 'Template for directive \'template\' must have exactly one root element.' ) ;
1228
+ } ) . toThrowMinErr ( '$compile' , 'tplrt' ) ;
1229
1229
} ) ;
1230
1230
} ) ;
1231
1231
@@ -1234,14 +1234,14 @@ describe('$compile', function() {
1234
1234
'whitespace' : ' <div>Hello World!</div> \n' ,
1235
1235
'comments' : '<!-- oh hi --><div>Hello World!</div> \n' ,
1236
1236
'comments + whitespace' : ' <!-- oh hi --> <div>Hello World!</div> <!-- oh hi -->\n'
1237
- } , function ( $prop ) {
1237
+ } , function ( directiveTemplate ) {
1238
1238
1239
- inject ( function ( $compile , $templateCache , $ rootScope) {
1240
- templateVar = $prop ;
1239
+ inject ( function ( $compile , $rootScope ) {
1240
+ templateVar = directiveTemplate ;
1241
1241
var element ;
1242
1242
expect ( function ( ) {
1243
1243
element = $compile ( '<p template></p>' ) ( $rootScope ) ;
1244
- } ) . not . toThrowMinErr ( '$compile' , 'tplrt' , 'Template for directive \'template\' must have exactly one root element.' ) ;
1244
+ } ) . not . toThrow ( ) ;
1245
1245
expect ( element . length ) . toBe ( 1 ) ;
1246
1246
expect ( element . text ( ) ) . toBe ( 'Hello World!' ) ;
1247
1247
} ) ;
@@ -2067,15 +2067,14 @@ describe('$compile', function() {
2067
2067
{
2068
2068
'no root element' : 'dada' ,
2069
2069
'multiple root elements' : '<div></div><div></div>'
2070
- } , function ( $prop ) {
2070
+ } , function ( directiveTemplate ) {
2071
2071
2072
2072
inject ( function ( $compile , $templateCache , $rootScope ) {
2073
- // no root element
2074
- $templateCache . put ( 'template.html' , $prop ) ;
2073
+ $templateCache . put ( 'template.html' , directiveTemplate ) ;
2075
2074
$compile ( '<p template></p>' ) ( $rootScope ) ;
2076
2075
expect ( function ( ) {
2077
2076
$rootScope . $digest ( ) ;
2078
- } ) . toThrowMinErr ( '$compile' , 'tplrt' , 'Template for directive \'template\' must have exactly one root element. template.html' ) ;
2077
+ } ) . toThrowMinErr ( '$compile' , 'tplrt' ) ;
2079
2078
} ) ;
2080
2079
} ) ;
2081
2080
@@ -2084,15 +2083,14 @@ describe('$compile', function() {
2084
2083
'whitespace' : ' <div>Hello World!</div> \n' ,
2085
2084
'comments' : '<!-- oh hi --><div>Hello World!</div> \n' ,
2086
2085
'comments + whitespace' : ' <!-- oh hi --> <div>Hello World!</div> <!-- oh hi -->\n'
2087
- } , function ( $prop ) {
2086
+ } , function ( directiveTemplate ) {
2088
2087
2089
2088
inject ( function ( $compile , $templateCache , $rootScope ) {
2090
- // no root element
2091
- $templateCache . put ( 'template.html' , $prop ) ;
2089
+ $templateCache . put ( 'template.html' , directiveTemplate ) ;
2092
2090
element = $compile ( '<p template></p>' ) ( $rootScope ) ;
2093
2091
expect ( function ( ) {
2094
2092
$rootScope . $digest ( ) ;
2095
- } ) . not . toThrowMinErr ( '$compile' , 'tplrt' , 'Template for directive \'template\' must have exactly one root element. template.html' ) ;
2093
+ } ) . not . toThrow ( ) ;
2096
2094
expect ( element . length ) . toBe ( 1 ) ;
2097
2095
expect ( element . text ( ) ) . toBe ( 'Hello World!' ) ;
2098
2096
} ) ;
0 commit comments