@@ -153,10 +153,8 @@ test("buttons - advanced", function( assert ) {
153
153
click : function ( ) {
154
154
equal ( this , element [ 0 ] , "correct context" ) ;
155
155
} ,
156
- icons : {
157
- primary : "ui-icon-cancel"
158
- } ,
159
- showText : false
156
+ icon : "ui-icon-cancel" ,
157
+ showLabel : false
160
158
}
161
159
]
162
160
} ) ;
@@ -166,8 +164,8 @@ test("buttons - advanced", function( assert ) {
166
164
equal ( buttons . attr ( "id" ) , "my-button-id" , "correct id" ) ;
167
165
equal ( buttons . text ( ) , "a button" , "correct label" ) ;
168
166
assert . hasClasses ( buttons , "additional-class" ) ;
169
- deepEqual ( buttons . button ( "option" , "icons " ) , { primary : "ui-icon-cancel" , secondary : null } ) ;
170
- equal ( buttons . button ( "option" , "text " ) , false ) ;
167
+ deepEqual ( buttons . button ( "option" , "icon " ) , "ui-icon-cancel" ) ;
168
+ equal ( buttons . button ( "option" , "showLabel " ) , false ) ;
171
169
buttons . click ( ) ;
172
170
173
171
element . remove ( ) ;
@@ -208,17 +206,17 @@ test("closeText", function() {
208
206
expect ( 3 ) ;
209
207
210
208
var element = $ ( "<div></div>" ) . dialog ( ) ;
211
- equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close span " ) . text ( ) , "Close" ,
209
+ equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close" ) . text ( ) , "Close" ,
212
210
"default close text" ) ;
213
211
element . remove ( ) ;
214
212
215
213
element = $ ( "<div></div>" ) . dialog ( { closeText : "foo" } ) ;
216
- equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close span " ) . text ( ) , "foo" ,
214
+ equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close" ) . text ( ) , "foo" ,
217
215
"closeText on init" ) ;
218
216
element . remove ( ) ;
219
217
220
218
element = $ ( "<div></div>" ) . dialog ( ) . dialog ( "option" , "closeText" , "bar" ) ;
221
- equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close span " ) . text ( ) , "bar" ,
219
+ equal ( element . dialog ( "widget" ) . find ( ".ui-dialog-titlebar-close" ) . text ( ) , "bar" ,
222
220
"closeText via option method" ) ;
223
221
element . remove ( ) ;
224
222
} ) ;
0 commit comments