@@ -69,7 +69,7 @@ describe('flex directive', () => {
69
69
70
70
71
71
it ( 'should work with percentage values' , ( ) => {
72
- expectDOMFrom ( `<div fxFlexOffset='17' fxFlex='37'></div>` ) . toHaveCssStyle ( {
72
+ expectDOMFrom ( `<div fxFlexOffset='17' fxFlex='37'></div>` ) . toHaveStyle ( {
73
73
'flex' : '1 1 100%' ,
74
74
'box-sizing' : 'border-box' ,
75
75
'margin-left' : '17%'
@@ -87,8 +87,8 @@ describe('flex directive', () => {
87
87
let element = queryFor ( fixture , '[fxFlex]' ) [ 0 ] . nativeElement ;
88
88
89
89
// parent flex-direction found with 'column' with child height styles
90
- expect ( parent ) . toHaveCssStyle ( { 'flex-direction' : 'column' , 'display' : 'flex' } ) ;
91
- expect ( element ) . toHaveCssStyle ( { 'margin-top' : '17px' } ) ;
90
+ expect ( parent ) . toHaveStyle ( { 'flex-direction' : 'column' , 'display' : 'flex' } ) ;
91
+ expect ( element ) . toHaveStyle ( { 'margin-top' : '17px' } ) ;
92
92
} ) ;
93
93
94
94
it ( 'should CSS stylesheet and not inject flex-direction on parent' , ( ) => {
@@ -106,8 +106,8 @@ describe('flex directive', () => {
106
106
let element = queryFor ( fixture , '[fxFlex]' ) [ 0 ] . nativeElement ;
107
107
108
108
// parent flex-direction found with 'column' with child height styles
109
- expect ( parent ) . toHaveCssStyle ( { 'flex-direction' : 'column' , 'display' : 'flex' } ) ;
110
- expect ( element ) . toHaveCssStyle ( { 'margin-top' : '41px' } ) ;
109
+ expect ( parent ) . toHaveStyle ( { 'flex-direction' : 'column' , 'display' : 'flex' } ) ;
110
+ expect ( element ) . toHaveStyle ( { 'margin-top' : '41px' } ) ;
111
111
} ) ;
112
112
113
113
it ( 'should work with styled-parent flex directions' , ( ) => {
@@ -123,16 +123,16 @@ describe('flex directive', () => {
123
123
let parent = queryFor ( fixture , '.parent' ) [ 0 ] . nativeElement ;
124
124
125
125
// parent flex-direction found with 'column'; set child with height styles
126
- expect ( element ) . toHaveCssStyle ( { 'margin-top' : '21%' } ) ;
127
- expect ( parent ) . toHaveCssStyle ( { 'flex-direction' : 'column' } ) ;
126
+ expect ( element ) . toHaveStyle ( { 'margin-top' : '21%' } ) ;
127
+ expect ( parent ) . toHaveStyle ( { 'flex-direction' : 'column' } ) ;
128
128
} ) ;
129
129
130
130
it ( 'should ignore fxLayout settings on same element' , ( ) => {
131
131
expectDOMFrom ( `
132
132
<div fxLayout='column' fxFlex='37%' fxFlexOffset='52px' >
133
133
</div>
134
134
` )
135
- . not . toHaveCssStyle ( {
135
+ . not . toHaveStyle ( {
136
136
'flex-direction' : 'row' ,
137
137
'flex' : '1 1 100%' ,
138
138
'margin-left' : '52px' ,
0 commit comments