| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 GEN('#include "chrome/test/data/webui/history_ui_browsertest.h"'); | 5 GEN('#include "chrome/test/data/webui/history_ui_browsertest.h"'); |
| 6 | 6 |
| 7 /** @const */ var TOTAL_RESULT_COUNT = 160; | 7 /** @const */ var TOTAL_RESULT_COUNT = 160; |
| 8 /** @const */ var WAIT_TIMEOUT = 200; | 8 /** @const */ var WAIT_TIMEOUT = 200; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 | 658 |
| 659 setUp: function() { | 659 setUp: function() { |
| 660 // Show the filter controls as if the command line switch was active. | 660 // Show the filter controls as if the command line switch was active. |
| 661 $('top-container').hidden = true; | 661 $('top-container').hidden = true; |
| 662 $('history-page').classList.add('big-topbar-page'); | 662 $('history-page').classList.add('big-topbar-page'); |
| 663 $('filter-controls').hidden = false; | 663 $('filter-controls').hidden = false; |
| 664 expectFalse($('filter-controls').hidden); | 664 expectFalse($('filter-controls').hidden); |
| 665 }, | 665 }, |
| 666 }; | 666 }; |
| 667 | 667 |
| 668 TEST_F('RangeHistoryWebUITest', 'allView', function() { | 668 /** |
| 669 * Disabled due to timeout on Mac http://crbug.com/377338 |
| 670 */ |
| 671 GEN('#if defined(OS_MACOSX)'); |
| 672 GEN('#define MAYBE_allView DISABLED_allView'); |
| 673 GEN('#else'); |
| 674 GEN('#define MAYBE_allView allView'); |
| 675 GEN('#endif'); |
| 676 TEST_F('RangeHistoryWebUITest', 'MAYBE_allView', function() { |
| 669 // Check that we start off in the all time view. | 677 // Check that we start off in the all time view. |
| 670 expectTrue($('timeframe-filter-all').checked); | 678 expectTrue($('timeframe-filter-all').checked); |
| 671 // See if the correct number of days is shown. | 679 // See if the correct number of days is shown. |
| 672 var dayHeaders = document.querySelectorAll('.day'); | 680 var dayHeaders = document.querySelectorAll('.day'); |
| 673 assertEquals(Math.ceil(RESULTS_PER_PAGE / 4), dayHeaders.length); | 681 assertEquals(Math.ceil(RESULTS_PER_PAGE / 4), dayHeaders.length); |
| 674 testDone(); | 682 testDone(); |
| 675 }); | 683 }); |
| 676 | 684 |
| 677 /** | 685 /** |
| 678 * Checks whether the domains in a day are ordered decreasingly. | 686 * Checks whether the domains in a day are ordered decreasingly. |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 928 TEST_F('HistoryWebUIWithSchemesTest', 'groupingWithSchemes', function() { | 936 TEST_F('HistoryWebUIWithSchemesTest', 'groupingWithSchemes', function() { |
| 929 // Switch to the week view. | 937 // Switch to the week view. |
| 930 $('timeframe-filter-week').click(); | 938 $('timeframe-filter-week').click(); |
| 931 waitForCallback('historyResult', function() { | 939 waitForCallback('historyResult', function() { |
| 932 // Each URL should be organized under a different "domain". | 940 // Each URL should be organized under a different "domain". |
| 933 expectEquals(document.querySelectorAll('.entry').length, 4); | 941 expectEquals(document.querySelectorAll('.entry').length, 4); |
| 934 expectEquals(document.querySelectorAll('.site-domain-wrapper').length, 4); | 942 expectEquals(document.querySelectorAll('.site-domain-wrapper').length, 4); |
| 935 testDone(); | 943 testDone(); |
| 936 }); | 944 }); |
| 937 }); | 945 }); |
| OLD | NEW |