@@ -2039,14 +2039,29 @@ describe('ngMock', function() {
2039
2039
2040
2040
describe ( '$controllerDecorator' , function ( ) {
2041
2041
2042
- describe ( 'with `preAssignBindingsEnabled(true)`' , function ( ) {
2043
-
2044
- beforeEach ( module ( function ( $compileProvider ) {
2045
- $compileProvider . preAssignBindingsEnabled ( true ) ;
2046
- } ) ) ;
2042
+ it ( 'should support creating controller with bindings' , function ( ) {
2043
+ var called = false ;
2044
+ var data = [
2045
+ { name : 'derp1' , id : 0 } ,
2046
+ { name : 'testname' , id : 1 } ,
2047
+ { name : 'flurp' , id : 2 }
2048
+ ] ;
2049
+ module ( function ( $controllerProvider ) {
2050
+ $controllerProvider . register ( 'testCtrl' , function ( ) {
2051
+ expect ( this . data ) . toBeUndefined ( ) ;
2052
+ called = true ;
2053
+ } ) ;
2054
+ } ) ;
2055
+ inject ( function ( $controller , $rootScope ) {
2056
+ var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2057
+ expect ( ctrl . data ) . toBe ( data ) ;
2058
+ expect ( called ) . toBe ( true ) ;
2059
+ } ) ;
2060
+ } ) ;
2047
2061
2048
2062
2049
- it ( 'should support creating controller with bindings' , function ( ) {
2063
+ it ( 'should support assigning bindings when a value is returned from the constructor' ,
2064
+ function ( ) {
2050
2065
var called = false ;
2051
2066
var data = [
2052
2067
{ name : 'derp1' , id : 0 } ,
@@ -2055,138 +2070,40 @@ describe('ngMock', function() {
2055
2070
] ;
2056
2071
module ( function ( $controllerProvider ) {
2057
2072
$controllerProvider . register ( 'testCtrl' , function ( ) {
2058
- expect ( this . data ) . toBe ( data ) ;
2073
+ expect ( this . data ) . toBeUndefined ( ) ;
2059
2074
called = true ;
2075
+ return { } ;
2060
2076
} ) ;
2061
2077
} ) ;
2062
2078
inject ( function ( $controller , $rootScope ) {
2063
2079
var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2064
2080
expect ( ctrl . data ) . toBe ( data ) ;
2065
2081
expect ( called ) . toBe ( true ) ;
2066
2082
} ) ;
2067
- } ) ;
2068
-
2069
-
2070
- it ( 'should support assigning bindings when a value is returned from the constructor' ,
2071
- function ( ) {
2072
- var called = false ;
2073
- var data = [
2074
- { name : 'derp1' , id : 0 } ,
2075
- { name : 'testname' , id : 1 } ,
2076
- { name : 'flurp' , id : 2 }
2077
- ] ;
2078
- module ( function ( $controllerProvider ) {
2079
- $controllerProvider . register ( 'testCtrl' , function ( ) {
2080
- expect ( this . data ) . toBe ( data ) ;
2081
- called = true ;
2082
- return { } ;
2083
- } ) ;
2084
- } ) ;
2085
- inject ( function ( $controller , $rootScope ) {
2086
- var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2087
- expect ( ctrl . data ) . toBe ( data ) ;
2088
- expect ( called ) . toBe ( true ) ;
2089
- } ) ;
2090
- }
2091
- ) ;
2092
-
2093
-
2094
- if ( / c h r o m e / . test ( window . navigator . userAgent ) ) {
2095
- it ( 'should support assigning bindings to class-based controller' , function ( ) {
2096
- var called = false ;
2097
- var data = [
2098
- { name : 'derp1' , id : 0 } ,
2099
- { name : 'testname' , id : 1 } ,
2100
- { name : 'flurp' , id : 2 }
2101
- ] ;
2102
- module ( function ( $controllerProvider ) {
2103
- // eslint-disable-next-line no-eval
2104
- var TestCtrl = eval ( '(class { constructor() { called = true; } })' ) ;
2105
- $controllerProvider . register ( 'testCtrl' , TestCtrl ) ;
2106
- } ) ;
2107
- inject ( function ( $controller , $rootScope ) {
2108
- var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2109
- expect ( ctrl . data ) . toBe ( data ) ;
2110
- expect ( called ) . toBe ( true ) ;
2111
- } ) ;
2112
- } ) ;
2113
2083
}
2114
- } ) ;
2115
-
2084
+ ) ;
2116
2085
2117
- describe ( 'with `preAssignBindingsEnabled(false)`' , function ( ) {
2118
2086
2119
- beforeEach ( module ( function ( $compileProvider ) {
2120
- $compileProvider . preAssignBindingsEnabled ( false ) ;
2121
- } ) ) ;
2122
-
2123
-
2124
- it ( 'should support creating controller with bindings' , function ( ) {
2087
+ if ( / c h r o m e / . test ( window . navigator . userAgent ) ) {
2088
+ it ( 'should support assigning bindings to class-based controller' , function ( ) {
2125
2089
var called = false ;
2126
2090
var data = [
2127
2091
{ name : 'derp1' , id : 0 } ,
2128
2092
{ name : 'testname' , id : 1 } ,
2129
2093
{ name : 'flurp' , id : 2 }
2130
2094
] ;
2131
2095
module ( function ( $controllerProvider ) {
2132
- $controllerProvider . register ( 'testCtrl' , function ( ) {
2133
- expect ( this . data ) . toBeUndefined ( ) ;
2134
- called = true ;
2135
- } ) ;
2096
+ // eslint-disable-next-line no-eval
2097
+ var TestCtrl = eval ( '(class { constructor() { called = true; } })' ) ;
2098
+ $controllerProvider . register ( 'testCtrl' , TestCtrl ) ;
2136
2099
} ) ;
2137
2100
inject ( function ( $controller , $rootScope ) {
2138
2101
var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2139
2102
expect ( ctrl . data ) . toBe ( data ) ;
2140
2103
expect ( called ) . toBe ( true ) ;
2141
2104
} ) ;
2142
2105
} ) ;
2143
-
2144
-
2145
- it ( 'should support assigning bindings when a value is returned from the constructor' ,
2146
- function ( ) {
2147
- var called = false ;
2148
- var data = [
2149
- { name : 'derp1' , id : 0 } ,
2150
- { name : 'testname' , id : 1 } ,
2151
- { name : 'flurp' , id : 2 }
2152
- ] ;
2153
- module ( function ( $controllerProvider ) {
2154
- $controllerProvider . register ( 'testCtrl' , function ( ) {
2155
- expect ( this . data ) . toBeUndefined ( ) ;
2156
- called = true ;
2157
- return { } ;
2158
- } ) ;
2159
- } ) ;
2160
- inject ( function ( $controller , $rootScope ) {
2161
- var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2162
- expect ( ctrl . data ) . toBe ( data ) ;
2163
- expect ( called ) . toBe ( true ) ;
2164
- } ) ;
2165
- }
2166
- ) ;
2167
-
2168
-
2169
- if ( / c h r o m e / . test ( window . navigator . userAgent ) ) {
2170
- it ( 'should support assigning bindings to class-based controller' , function ( ) {
2171
- var called = false ;
2172
- var data = [
2173
- { name : 'derp1' , id : 0 } ,
2174
- { name : 'testname' , id : 1 } ,
2175
- { name : 'flurp' , id : 2 }
2176
- ] ;
2177
- module ( function ( $controllerProvider ) {
2178
- // eslint-disable-next-line no-eval
2179
- var TestCtrl = eval ( '(class { constructor() { called = true; } })' ) ;
2180
- $controllerProvider . register ( 'testCtrl' , TestCtrl ) ;
2181
- } ) ;
2182
- inject ( function ( $controller , $rootScope ) {
2183
- var ctrl = $controller ( 'testCtrl' , { scope : $rootScope } , { data : data } ) ;
2184
- expect ( ctrl . data ) . toBe ( data ) ;
2185
- expect ( called ) . toBe ( true ) ;
2186
- } ) ;
2187
- } ) ;
2188
- }
2189
- } ) ;
2106
+ }
2190
2107
} ) ;
2191
2108
2192
2109
0 commit comments