Bug Tracker

Show
Ignore:
Timestamp:
01/21/08 12:45:44 (1 year ago)
Author:
kbwood.au
Message:

Refactor datepicker functions
Test removeDatepicker

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/ui/current/datepicker/test/ui.datepicker.tests.html

    r4491 r4501  
    1313    $('#dp').attachDatepicker({clearText: 'Erase'}); 
    1414    $('#adj').attachDatepicker(); 
     15    $('#rem').attachDatepicker({showOn: 'both'}); 
    1516    setUpPageStatus = "complete"; 
    1617} 
     
    2324} 
    2425 
     26function testRemove() { 
     27    var rem = $('#rem'); 
     28    assertEquals('Missing ID', 2, rem[0]._calId); 
     29    assertTrue('Missing wrapper', rem.parent('.datepicker_wrap').length > 0); 
     30    assertTrue('Missing marker class', rem.is('.hasDatepicker')); 
     31    rem.removeDatepicker(); 
     32    rem = $('#rem'); 
     33    assertUndefined('ID still there', rem[0]._calId); 
     34    assertFalse('Wrapper still there', rem.parent('.datepicker_wrap').length > 0); 
     35    assertFalse('Marker class still there', rem.is('.hasDatepicker')); 
     36} 
     37 
    2538function testDisableEnable() { 
    26     assertFalse('Control is disabled', $.datepicker.isDisabled('#dp')); 
     39    var dp = $('#dp'); 
     40    assertFalse('Control is disabled', dp.isDisabledDatepicker()); 
    2741    $('#dp').disableDatepicker(); 
    28     assertTrue('Control is enabled by ID', $.datepicker.isDisabled($('#dp'))); 
     42    assertTrue('Control is enabled by ID', dp.isDisabledDatepicker()); 
    2943    $('#dp').enableDatepicker(); 
    30     assertFalse('Control is disabled by ID', $.datepicker.isDisabled($('#dp')[0])); 
    31     $('#dp').disableDatepicker(); 
    32     assertTrue('Control is enabled by jQuery', $.datepicker.isDisabled($('#dp'))); 
    33     $('#dp').enableDatepicker(); 
    34     assertFalse('Control is disabled by jQuery', $.datepicker.isDisabled($('#dp')[0])); 
    35     $('#dp:first').disableDatepicker(); 
    36     assertTrue('Control is enabled by element', $.datepicker.isDisabled('#dp')); 
    37     $('#dp:first').enableDatepicker(); 
    38     assertFalse('Control is disabled by element', $.datepicker.isDisabled('#dp')); 
     44    assertFalse('Control is disabled by ID', dp.isDisabledDatepicker()); 
    3945} 
    4046 
     
    5460    assertNull('Invalid instance clearText', $.datepicker._inst[0]._settings.clearText); 
    5561    $('#dp').changeDatepicker({clearText: 'Erase'}); 
     62    assertEquals('Invalid instance clearText', 'Erase', 
     63        $.datepicker._inst[0]._settings.clearText); 
     64    $('#dp').changeDatepicker('clearText', 'X1'); 
     65    assertEquals('Invalid instance clearText', 'X1', 
     66        $.datepicker._inst[0]._settings.clearText); 
     67    $('#dp:first').changeDatepicker('clearText', null); 
     68    assertNull('Invalid instance clearText', $.datepicker._inst[0]._settings.clearText); 
     69    $('#dp').changeDatepicker('clearText', 'Erase'); 
     70    assertEquals('Invalid instance clearText', 'Erase', 
     71        $.datepicker._inst[0]._settings.clearText); 
    5672} 
    5773 
    5874function testSetGetDateFor() { 
    59     assertNull('Invalid date set', $.datepicker.getDateFor('#dp')); 
     75    var dp = $('#dp'); 
     76    assertNull('Invalid date set', dp.getDatepickerDate()); 
    6077    var date = new Date(2001, 2 - 1, 3); 
    61     $.datepicker.setDateFor('#dp', date); 
    62     assertEquals('Invalid date set/get by ID', date.toString(), 
    63         $.datepicker.getDateFor('#dp').toString()); 
    64     date = new Date(2002, 3 - 1, 4); 
    65     $.datepicker.setDateFor($('#dp'), date); 
     78    dp.setDatepickerDate(date); 
    6679    assertEquals('Invalid date set/get by jQuery', date.toString(),  
    67         $.datepicker.getDateFor($('#dp')).toString()); 
    68     date = new Date(2003, 4 - 1, 5); 
    69     $.datepicker.setDateFor($('#dp')[0], date); 
    70     assertEquals('Invalid date set/get by element', date.toString(), 
    71         $.datepicker.getDateFor($('#dp')[0]).toString()); 
     80        dp.getDatepickerDate().toString()); 
    7281} 
    7382 
     
    362371 
    363372function testAdjustDate() { 
     373    var adj = $('#adj'); 
    364374    var inst = $.datepicker._inst[1]; 
    365375    inst._rangeStart = null; 
    366     $('#adj').changeDatepicker({minDate: null, maxDate: null}); 
    367     $.datepicker.setDateFor('#adj', new Date(2001, 2 - 1, 3)); 
     376    adj.changeDatepicker({minDate: null, maxDate: null}). 
     377        setDatepickerDate(new Date(2001, 2 - 1, 3)); 
    368378    var adjusts = [[0, 'D', 2001, 2, 3], [1, 'D', 2001, 2, 4], 
    369379        [7, 'D', 2001, 2, 11], [-8, 'D', 2001, 2, 3], 
     
    381391    } 
    382392    // with minimum 
    383     $('#adj').changeDatepicker({minDate: new Date(2001, 1 - 1, 1)}); 
    384     $.datepicker.setDateFor('#adj', new Date(2001, 2 - 1, 3)); 
     393    adj.changeDatepicker({minDate: new Date(2001, 1 - 1, 1)}). 
     394        setDatepickerDate(new Date(2001, 2 - 1, 3)); 
    385395    adjusts = [[0, 'D', 2001, 2, 3], [7, 'D', 2001, 2, 10], 
    386396        [-88, 'D', 2001, 1, 1], [5, 'D', 2001, 1, 6], 
     
    396406    } 
    397407    // with maximum 
    398     $('#adj').changeDatepicker({minDate: null, maxDate: new Date(2001, 6 - 1, 30)}); 
    399     $.datepicker.setDateFor('#adj', new Date(2001, 2 - 1, 3)); 
     408    adj.changeDatepicker({minDate: null, maxDate: new Date(2001, 6 - 1, 30)}). 
     409        setDatepickerDate(new Date(2001, 2 - 1, 3)); 
    400410    adjusts = [[0, 'D', 2001, 2, 3], [7, 'D', 2001, 2, 10], 
    401411        [200, 'D', 2001, 6, 30], [-184, 'D', 2000, 12, 28], 
     
    518528<p><input type="text" id="dp"/></p> 
    519529<p><input type="text" id="adj"/></p> 
     530<p><input type="text" id="rem"/></p> 
    520531</body> 
    521532</html>