Changeset 84525 in webkit


Ignore:
Timestamp:
Apr 21, 2011 11:28:55 AM (13 years ago)
Author:
ojan@chromium.org
Message:

2011-04-21 Ojan Vafai <ojan@chromium.org>

Reviewed by Mihai Parparita.

fix another innocuous JS error in expand/collapseAllExpectations
https://bugs.webkit.org/show_bug.cgi?id=59122

  • Scripts/webkitpy/layout_tests/layout_package/json_results.html:
  • Scripts/webkitpy/layout_tests/layout_package/json_results_test.js:
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r84518 r84525  
     12011-04-21  Ojan Vafai  <ojan@chromium.org>
     2
     3        Reviewed by Mihai Parparita.
     4
     5        fix another innocuous JS error in expand/collapseAllExpectations
     6        https://bugs.webkit.org/show_bug.cgi?id=59122
     7
     8        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
     9        * Scripts/webkitpy/layout_tests/layout_package/json_results_test.js:
     10
    1112011-04-20  Ojan Vafai  <ojan@chromium.org>
    212
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html

    r84518 r84525  
    226226{
    227227    var expandLinks = document.querySelectorAll('.expand-button-text');
    228     for (var i = 0; len = expandLinks.length; i++)
     228    for (var i = 0, len = expandLinks.length; i < len; i++)
    229229        expandExpectations(expandLinks[i]);
    230230}
     
    233233{
    234234    var expandLinks = document.querySelectorAll('.expand-button-text');
    235     for (var i = 0; len = expandLinks.length; i++)
     235    for (var i = 0, len = expandLinks.length; i < len; i++)
    236236        collapseExpectations(expandLinks[i]);
    237237}
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_test.js

    r84518 r84525  
    116116        assertTrue(expectationTypes[1].textContent == 'CRASH');
    117117        assertTrue(expectationTypes[2].textContent == 'IMAGE');
    118 
    119118    });
    120119
     120    results = mockResults();
     121    results.tests['foo/bar.html'] = mockExpectation('TEXT', 'PASS');
     122    results.tests['foo/bar-missing.html'] = mockExpectation('TEXT', 'MISSING');
     123    results.tests['foo/bar-missing.html'].is_missing_text = true;
     124    results.tests['foo/bar-stderr.html'] = mockExpectation('PASS', 'TEXT');
     125    results.tests['foo/bar-stderr.html'].has_stderr = true;
     126    results.tests['foo/bar-unexpected-pass.html'] = mockExpectation('TEXT', 'PASS');
     127    runTest(results, function() {
     128        assertTrue(document.querySelectorAll('tbody tr').length == 5);
     129        expandAllExpectations();
     130        assertTrue(document.querySelectorAll('tbody tr').length == 10);
     131        var expandLinks = document.querySelectorAll('.expand-button-text');
     132        var enDash = '\u2013';
     133        for (var i = 0; i < expandLinks.length; i++) {
     134            assertTrue(expandLinks[i].textContent == enDash);
     135        }
     136       
     137        collapseAllExpectations();
     138        // Collapsed expectations stay in the dom, but are display:none.
     139        assertTrue(document.querySelectorAll('tbody tr').length == 10);
     140        var expandLinks = document.querySelectorAll('.expand-button-text');
     141        for (var i = 0; i < expandLinks.length; i++)
     142            assertTrue(expandLinks[i].textContent == '+');
     143           
     144        expandExpectations(expandLinks[1]);
     145        assertTrue(expandLinks[0].textContent == '+');
     146        assertTrue(expandLinks[1].textContent == enDash);
     147
     148        collapseExpectations(expandLinks[1]);
     149        assertTrue(expandLinks[1].textContent == '+');
     150    });
    121151    document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
    122152}
Note: See TracChangeset for help on using the changeset viewer.