Changeset 85654 in webkit
- Timestamp:
- May 3, 2011 1:51:46 PM (13 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r85648 r85654 1 2011-05-03 Ojan Vafai <ojan@chromium.org> 2 3 Reviewed by Tony Chang. 4 5 store results.html options in localstorage 6 https://bugs.webkit.org/show_bug.cgi?id=60048 7 8 This makes options persistent per-domain. It's not perfect, 9 but it should make it possible to have preferences for how 10 people would like the results.html page to render. 11 12 * fast/harness/resources/results-test.js: 13 * fast/harness/results.html: 14 1 15 2011-05-03 Igor Oliveira <igor.oliveira@openbossa.org> 2 16 -
trunk/LayoutTests/fast/harness/resources/results-test.js
r85634 r85654 63 63 } 64 64 65 function runTest(results, assertions )65 function runTest(results, assertions, opt_localStorageValue) 66 66 { 67 67 document.body.innerHTML = ''; 68 68 g_testIndex++; 69 69 g_state = undefined; 70 localStorage.setItem(OptionWriter._key, opt_localStorageValue || ''); 70 71 71 72 try { … … 390 391 assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == ' images diff '); 391 392 }); 393 394 results = mockResults(); 395 results.tests['reading-options-from-localstorage.html'] = mockExpectation('IMAGE+TEXT', 'IMAGE+TEXT'); 396 runTest(results, function() { 397 assertTrue(window.getComputedStyle(document.querySelector('tbody'), null)['display'] != 'none'); 398 assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == 'expected actual diff '); 399 }, '{"toggle-images":false,"unexpected-results":false}'); 392 400 393 401 document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>'; -
trunk/LayoutTests/fast/harness/results.html
r85638 r85654 757 757 function onlyShowUnexpectedFailures() 758 758 { 759 var checkBox = document.getElementById('unexpected-results'); 760 return !checkBox || checkBox.checked; 759 return document.getElementById('unexpected-results').checked; 760 } 761 762 function handleUnexpectedResultsChange() 763 { 764 OptionWriter.save(); 765 updateExpectedFailures(); 761 766 } 762 767 … … 765 770 document.getElementById('unexpected-style').innerText = onlyShowUnexpectedFailures() ? 766 771 '.expected { display: none; }' : ''; 772 } 773 774 var OptionWriter = {}; 775 776 OptionWriter._key = 'run-webkit-tests-options'; 777 778 OptionWriter.save = function() 779 { 780 var options = document.querySelectorAll('label input'); 781 var data = {}; 782 for (var i = 0, len = options.length; i < len; i++) { 783 var option = options[i]; 784 data[option.id] = option.checked; 785 } 786 localStorage.setItem(OptionWriter._key, JSON.stringify(data)); 787 } 788 789 OptionWriter.apply = function() 790 { 791 var json = localStorage.getItem(OptionWriter._key); 792 if (!json) 793 return; 794 795 var data = JSON.parse(json); 796 for (var id in data) { 797 var input = document.getElementById(id); 798 if (input) { 799 input.checked = data[id]; 800 input.onchange(); 801 } 802 } 803 } 804 805 function handleToggleImagesChange() 806 { 807 OptionWriter.save(); 808 updateTogglingImages(); 767 809 } 768 810 … … 787 829 } 788 830 789 790 831 function getResultContainer(node) 791 832 { … … 833 874 '<a href="javascript:void()" onclick="expandAllExpectations()">expand all</a> ' + 834 875 '<a href="javascript:void()" onclick="collapseAllExpectations()">collapse all</a> ' + 835 '<a href="javascript:void()" id=options-link onclick="toggleOptionsMenu()">options</a><div id=options-menu class=hidden-menu>'; 836 837 // FIXME: store these as prefs in localstorage? 838 if (globalState().results.uses_expectations_file) 839 html += '<label><input id="unexpected-results" type=checkbox checked onchange="updateExpectedFailures()">Only show unexpected results</label>'; 840 841 html += '<label><input id="toggle-images" type=checkbox checked onchange="updateTogglingImages()">Toggle images</label>'; 842 843 html += '</div></div>'; 876 '<a href="javascript:void()" id=options-link onclick="toggleOptionsMenu()">options</a>' + 877 '<div id=options-menu class=hidden-menu>' + 878 '<label><input id="unexpected-results" type=checkbox checked onchange="handleUnexpectedResultsChange()">Only show unexpected results</label>' + 879 '<label><input id="toggle-images" type=checkbox checked onchange="handleToggleImagesChange()">Toggle images</label>' + 880 '</div></div>'; 844 881 845 882 var tableRowsHtml = tableRows(); … … 875 912 document.body.innerHTML = html; 876 913 914 OptionWriter.apply(); 915 877 916 if (document.getElementById('results-table')) { 878 917 document.getElementById('results-table').addEventListener('click', TableSorter.handleClick, false); 879 918 TableSorter.sortColumn(0); 919 if (!globalState().results.uses_expectations_file) 920 parentOfType(document.getElementById('unexpected-results'), 'label').style.display = 'none'; 880 921 if (!globalState().hasTextFailures) 881 922 document.getElementById('text-results-header').textContent = ''; … … 885 926 } 886 927 } 887 888 updateExpectedFailures();889 928 } 890 929 </script>
Note: See TracChangeset
for help on using the changeset viewer.