Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3880)

Unified Diff: chrome/test/data/webui/history_browsertest.js

Issue 15969014: History: Update managed user history page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser tests Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/webui/history_browsertest.js
diff --git a/chrome/test/data/webui/history_browsertest.js b/chrome/test/data/webui/history_browsertest.js
index 070d93f09ce808eb737c97d54e2071fb4ed40c43..226458385dc55b00fea01cb7f6025bea991f7093 100644
--- a/chrome/test/data/webui/history_browsertest.js
+++ b/chrome/test/data/webui/history_browsertest.js
@@ -630,6 +630,8 @@ RangeHistoryWebUITest.prototype = {
setUp: function() {
// Show the filter controls as if the command line switch was active.
+ $('top-container').hidden = true;
+ $('history-page').classList.add('big-topbar-page');
$('filter-controls').hidden = false;
expectFalse($('filter-controls').hidden);
},
@@ -637,8 +639,7 @@ RangeHistoryWebUITest.prototype = {
TEST_F('RangeHistoryWebUITest', 'allView', function() {
// Check that we start off in the all time view.
- expectEquals(parseInt($('timeframe-filter').value, 10),
- HistoryModel.Range.ALL_TIME);
+ expectTrue($('timeframe-filter-all').checked);
// See if the correct number of days is shown.
var dayHeaders = document.querySelectorAll('.day');
assertEquals(Math.ceil(RESULTS_PER_PAGE / 4), dayHeaders.length);
@@ -669,23 +670,9 @@ function checkGroupedVisits(element) {
}
}
-TEST_F('RangeHistoryWebUITest', 'weekView', function() {
- // Change to weekly view.
- $('timeframe-filter').value = HistoryModel.Range.WEEK;
- historyView.setRangeInDays(HistoryModel.Range.WEEK);
- waitForCallback('historyResult', function() {
- // See if the correct number of days is shown.
- var dayHeaders = document.querySelectorAll('.day');
- assertEquals(7, dayHeaders.length);
- expectFalse(document.querySelector('h2.timeframe').hidden);
-
- testDone();
- });
-});
-
TEST_F('RangeHistoryWebUITest', 'weekViewGrouped', function() {
// Change to weekly view.
- setPageState('', 0, true, HistoryModel.Range.WEEK, 0);
+ setPageState('', 0, HistoryModel.Range.WEEK, 0);
waitForCallback('historyResult', function() {
// See if the correct number of days is still shown.
var dayResults = document.querySelectorAll('.day-results');
@@ -699,21 +686,9 @@ TEST_F('RangeHistoryWebUITest', 'weekViewGrouped', function() {
});
});
-TEST_F('RangeHistoryWebUITest', 'monthView', function() {
- // Change to monthly view.
- setPageState('', 0, false, HistoryModel.Range.MONTH, 0);
- waitForCallback('historyResult', function() {
- // See if the correct number of days is shown.
- var dayHeaders = document.querySelectorAll('.day');
- assertEquals(2, dayHeaders.length);
- expectFalse(document.querySelector('h2.timeframe').hidden);
- testDone();
- });
-});
-
TEST_F('RangeHistoryWebUITest', 'monthViewGrouped', function() {
// Change to monthly view.
- setPageState('', 0, true, HistoryModel.Range.MONTH, 0);
+ setPageState('', 0, HistoryModel.Range.MONTH, 0);
waitForCallback('historyResult', function() {
// See if the correct number of days is shown.
var monthResults = document.querySelectorAll('.month-results');
@@ -727,7 +702,7 @@ TEST_F('RangeHistoryWebUITest', 'monthViewGrouped', function() {
TEST_F('RangeHistoryWebUITest', 'monthViewEmptyMonth', function() {
// Change to monthly view.
- setPageState('', 0, true, HistoryModel.Range.MONTH, 2);
+ setPageState('', 0, HistoryModel.Range.MONTH, 2);
waitForCallback('historyResult', function() {
// See if the correct number of days is shown.
« chrome/browser/resources/history/history.css ('K') | « chrome/browser/ui/webui/history_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698