[MD History] Fix toolbar dates in grouped mode.

chrome/test/data/webui/md_history/history_grouped_list_test.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('md_history.history_grouped_list_test', function() {
   function registerTests() {
     suite('history-grouped-list', function() {
       var app;
       var toolbar;
       var groupedList;
@@ skipping 62 matching lines @@
         assertEquals('history', sidebar.$.menu.selected);
 
         app.set('queryState_.range', HistoryRange.MONTH);
         assertEquals('grouped-list', content.selected);
         assertEquals('history', sidebar.$.menu.selected);
       });
 
       test('items grouped by domain', function() {
         app.set('queryState_.range', HistoryRange.WEEK);
         var info = createHistoryInfo();
-        info.queryStartTime = 'Yesterday';
-        info.queryEndTime = 'Now';
         app.historyResult(info, SIMPLE_RESULTS);
         return PolymerTest.flushTasks().then(function() {
           var data = groupedList.groupedHistoryData_;
           // 1 card for the day with 3 domains.
           assertEquals(1, data.length);
           assertEquals(3, data[0].domains.length);
 
           // Most visits at the top.
           assertEquals(2, data[0].domains[0].visits.length);
           assertEquals(1, data[0].domains[1].visits.length);
           assertEquals(1, data[0].domains[2].visits.length);
+        });
+      });
 
-          // Ensure the toolbar displays the correct begin and end time.
-          assertEquals('Yesterday', toolbar.queryStartTime);
-          assertEquals('Now', toolbar.queryEndTime);
-        });
+      test('toolbar dates appear in grouped mode', function() {
+        app.set('queryState_.range', HistoryRange.MONTH);

[tsergeant, 2016/12/15 06:31:37]

This test is a bit confusing to read. The most relevant line is setting the
range, but it appears really far from the assertion. There's also two identical
chunks of code. My suggestion for how to lay it out:

<create and setup info>

app.set(range to month)
app.historyResult
assertEquals

app.historyResult(createHistoryInfo(), [])  // Reset the test

app.set(range to week)
app.historyResult
assertEquals

[calamity, 2016/12/15 06:57:00]

How about this?

+        var info = createHistoryInfo();

[tsergeant, 2016/12/15 06:31:37]

Also, should the new info fields appear in createHistoryInfo? They're expected
to be there now, I guess.

(If you do that, then maybe you don't need to duplicate the createHistoryInfo()
block?)

[calamity, 2016/12/15 06:57:00]

Hmm. So, the way this test is set up actually implicitly caught the issue that I
mentioned in the comment. I think this kind of real world scenario is nicer.

+        info.queryStartMonth = 'Dec 2016';
+        info.queryStartTimeShort = 'Yesterday';
+        info.queryEndTimeShort = 'Now';
+        app.historyResult(info, SIMPLE_RESULTS);
+        assertEquals(
+            'Dec 2016', toolbar.$$('#grouped-date').textContent.trim());
+        app.set('queryState_.range', HistoryRange.WEEK);
+        info = createHistoryInfo();
+        info.queryStartMonth = 'Dec 2016';
+        info.queryStartTimeShort = 'Yesterday';
+        info.queryEndTimeShort = 'Now';
+        app.historyResult(info, SIMPLE_RESULTS);
+        assertEquals(
+            loadTimeData.getStringF('historyInterval', 'Yesterday', 'Now'),
+            toolbar.$$('#grouped-date').textContent.trim());
       });
 
       test('items grouped by day in week view', function() {
         app.set('queryState_.range', HistoryRange.WEEK);
         app.historyResult(createHistoryInfo(), PER_DAY_RESULTS);
         return PolymerTest.flushTasks().then(function() {
           var data = groupedList.groupedHistoryData_;
 
           // 3 cards.
           assertEquals(3, data.length);
@@ skipping 194 matching lines @@
         assertEquals(
             JSON.stringify(expected),
             JSON.stringify(groupedList.buildRemovalTree_(paths)));
       });
     });
   }
   return {
     registerTests: registerTests
   };
 });