From 54a5a46c91606e508e8ea7d5e0ca54844275f3ca Mon Sep 17 00:00:00 2001
From: Urs Wolfer <uwolfer@fwo.ch>
Date: Wed, 9 Mar 2016 21:04:22 +0100
Subject: [PATCH 1/4] Respect changes-per-page preference in change-list

Feature: Issue 3902
Change-Id: Ie916fbb72f663ef3ed175b77feb7455ebdbdf73d
---
 .../gr-change-list-view/gr-change-list-view.html |  9 +++++----
 .../gr-change-list-view/gr-change-list-view.js   | 16 ++++++++--------
 polygerrit-ui/app/elements/gr-app.html           |  1 +
 polygerrit-ui/app/elements/gr-app.js             |  9 +++++++++
 .../gr-rest-api-interface.js                     |  4 ++++
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
index 5b0327456d..6788cce626 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.html
@@ -66,7 +66,7 @@ limitations under the License.
     <gr-ajax
         auto
         url="/changes/"
-        params="[[_computeQueryParams(_query, _offset)]]"
+        params="[[_computeQueryParams(_query, _offset, changesPerPage)]]"
         last-response="{{_changes}}"
         last-error="{{_lastError}}"
         loading="{{_loading}}"></gr-ajax>
@@ -80,10 +80,11 @@ limitations under the License.
           selected-index="{{viewState.selectedChangeIndex}}"
           show-star="[[loggedIn]]"></gr-change-list>
       <nav>
-        <a href$="[[_computeNavLink(_query, _offset, -1)]]"
+        <a href$="[[_computeNavLink(_query, _offset, -1, changesPerPage)]]"
            hidden$="[[_hidePrevArrow(_offset)]]">&larr; Prev</a>
-        <a href$="[[_computeNavLink(_query, _offset, 1)]]"
-           hidden$="[[_hideNextArrow(_changes.length)]]">Next &rarr;</a>
+        <a href$="[[_computeNavLink(_query, _offset, 1, changesPerPage)]]"
+           hidden$="[[_hideNextArrow(_changes.length, changesPerPage)]]">
+          Next &rarr;</a>
       </nav>
     </div>
   </template>
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
index d0a97c1dfb..a694fc9256 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.js
@@ -14,8 +14,6 @@
 (function() {
   'use strict';
 
-  var DEFAULT_NUM_CHANGES = 25;
-
   Polymer({
     is: 'gr-change-list-view',
 
@@ -51,6 +49,8 @@
         value: function() { return {}; },
       },
 
+      changesPerPage: Number,
+
       /**
        * Currently active query.
        */
@@ -103,13 +103,13 @@
       this.fire('title-change', {title: this._query});
     },
 
-    _computeQueryParams: function(query, offset) {
+    _computeQueryParams: function(query, offset, changesPerPage) {
       var options = this.listChangesOptionsToHex(
           this.ListChangesOption.LABELS,
           this.ListChangesOption.DETAILED_ACCOUNTS
       );
       var obj = {
-        n: DEFAULT_NUM_CHANGES,  // Number of results to return.
+        n: changesPerPage,
         O: options,
         S: offset || 0,
       };
@@ -119,10 +119,10 @@
       return obj;
     },
 
-    _computeNavLink: function(query, offset, direction) {
+    _computeNavLink: function(query, offset, direction, changesPerPage) {
       // Offset could be a string when passed from the router.
       offset = +(offset || 0);
-      var newOffset = Math.max(0, offset + (25 * direction));
+      var newOffset = Math.max(0, offset + (changesPerPage * direction));
       var href = '/q/' + query;
       if (newOffset > 0) {
         href += ',' + newOffset;
@@ -142,8 +142,8 @@
       return offset == 0;
     },
 
-    _hideNextArrow: function(changesLen) {
-      return changesLen < DEFAULT_NUM_CHANGES;
+    _hideNextArrow: function(changesLen, changesPerPage) {
+      return changesLen < changesPerPage;
     },
   });
 })();
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index fd6525df5e..81915e6a2e 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -67,6 +67,7 @@ limitations under the License.
         <gr-change-list-view
             params="[[params]]"
             view-state="{{_viewState.changeListView}}"
+            changes-per-page="[[_preferences.changes_per_page]]"
             logged-in="[[_computeLoggedIn(account)]]"></gr-change-list-view>
       </template>
       <template is="dom-if" if="{{_showDashboardView}}" restamp="true">
diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js
index 475ea0df00..a40e61b915 100644
--- a/polygerrit-ui/app/elements/gr-app.js
+++ b/polygerrit-ui/app/elements/gr-app.js
@@ -54,6 +54,7 @@
       },
 
       _diffPreferences: Object,
+      _preferences: Object,
       _showChangeListView: Boolean,
       _showDashboardView: Boolean,
       _showChangeView: Boolean,
@@ -106,6 +107,10 @@
       this._resolveAccountReady();
       if (this.loggedIn) {
         this.$.diffPreferencesXHR.generateRequest();
+
+        this.$.restAPI.getPreferences().then(function(preferences) {
+          this._preferences = preferences;
+        }.bind(this));
       } else {
         // These defaults should match the defaults in
         // gerrit-extension-api/src/main/jcg/gerrit/extensions/client/DiffPreferencesInfo.java
@@ -125,6 +130,10 @@
           tab_size: 8,
           theme: 'DEFAULT',
         };
+
+        this._preferences = {
+          changes_per_page: 25,
+        };
       }
     },
 
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index 042e9018ee..5c7ae3afa5 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -86,6 +86,10 @@
       return this._fetchSharedCacheURL('/accounts/self/detail');
     },
 
+    getPreferences: function() {
+      return this._fetchSharedCacheURL('/accounts/self/preferences');
+    },
+
     _fetchSharedCacheURL: function(url) {
       if (this._sharedFetchPromises[url]) {
         return this._sharedFetchPromises[url];

From bba1fadfdcbea16962dd5d0b1a05d3947e4bd5d8 Mon Sep 17 00:00:00 2001
From: Andrew Bonventre <andybons@chromium.org>
Date: Wed, 9 Mar 2016 15:31:29 -0500
Subject: [PATCH 2/4] Add logged-out nav menu

+ Just the All (renamed Changes) to start.
+ Also fix broken search due to the query not being bound
  to the search bar properly.

Bug: Issue 3898
Change-Id: I718d11da382c191688b180c40a1fdeb3931f4bd8
---
 .../core/gr-main-header/gr-main-header.html   | 83 +++++++++++++++++--
 .../core/gr-main-header/gr-main-header.js     |  5 ++
 .../core/gr-search-bar/gr-search-bar.html     |  7 +-
 polygerrit-ui/app/elements/gr-app.html        |  2 +-
 polygerrit-ui/app/styles/app-theme.html       |  1 +
 5 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
index fd9a779b68..36f0209be2 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
@@ -25,9 +25,11 @@ limitations under the License.
   <template>
     <style>
       :host {
+        display: block;
+      }
+      nav {
         align-items: center;
         display: flex;
-        overflow: hidden;
       }
       .bigTitle {
         color: var(--primary-text-color);
@@ -37,6 +39,57 @@ limitations under the License.
       .bigTitle:hover {
         text-decoration: underline;
       }
+      ul {
+        list-style: none;
+      }
+      .links {
+        margin-left: 2em;
+      }
+      .links ul {
+        display: none;
+      }
+      .links > li {
+        cursor: default;
+        padding: .4em 0;
+        position: relative;
+      }
+      .links li:hover ul {
+        background-color: #fff;
+        box-shadow: 0 1px 1px rgba(0, 0, 0, .3);
+        display: block;
+        left: -.75em;
+        position: absolute;
+        top: 2em;
+        z-index: 1000;
+      }
+      .links li ul li a:link,
+      .links li ul li a:visited {
+        color: #00e;
+        display: block;
+        padding: .5em .75em;
+        text-decoration: none;
+      }
+      .links li ul li:hover a {
+        background-color: var(--selection-background-color);
+      }
+      .linksTitle {
+        display: inline-block;
+        padding-right: 1em;
+        position: relative;
+      }
+      .downArrow {
+        border-left: .36em solid transparent;
+        border-right: .36em solid transparent;
+        border-top: .36em solid #ccc;
+        height: 0;
+        position: absolute;
+        right: 0;
+        top: calc(50% - .1em);
+        width: 0;
+      }
+      .links li:hover .downArrow {
+        border-top-color: #666;
+      }
       .rightItems {
         display: flex;
         flex: 1;
@@ -73,14 +126,28 @@ limitations under the License.
         }
       }
     </style>
-    <a href="/" class="bigTitle">PolyGerrit</a>
-    <div class="rightItems">
-      <gr-search-bar value="{{params.query}}" role="search"></gr-search-bar>
-      <div class="accountContainer" id="accountContainer">
-        <a class="loginButton" href="/login" on-tap="_loginTapHandler">Login</a>
-        <gr-account-dropdown account="[[_account]]"></gr-account-dropdown>
+    <nav>
+      <a href="/" class="bigTitle">PolyGerrit</a>
+      <ul class="links">
+        <li>
+          <span class="linksTitle">
+            Changes <i class="downArrow"></i>
+          </span>
+          <ul>
+            <li><a href="/q/status:open">Open</a></li>
+            <li><a href="/q/status:merged">Merged</a></li>
+            <li><a href="/q/status:abandoned">Abandoned</a></li>
+          </ul>
+        </li>
+      </ul>
+      <div class="rightItems">
+        <gr-search-bar value="{{searchQuery}}" role="search"></gr-search-bar>
+        <div class="accountContainer" id="accountContainer">
+          <a class="loginButton" href="/login" on-tap="_loginTapHandler">Login</a>
+          <gr-account-dropdown account="[[_account]]"></gr-account-dropdown>
+        </div>
       </div>
-    </div>
+    </nav>
     <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
   </template>
   <script src="gr-main-header.js"></script>
diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
index afebc77293..c1b5afe63e 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
@@ -22,6 +22,11 @@
     },
 
     properties: {
+      searchQuery: {
+        type: String,
+        notify: true,
+      },
+
       _account: Object,
     },
 
diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.html b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.html
index c8c4523957..f559794fed 100644
--- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.html
+++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.html
@@ -30,12 +30,11 @@ limitations under the License.
       }
       input {
         border: 1px solid #d1d2d3;
-        outline: none;
-      }
-      input {
+        border-radius: 2px 0 0 2px;
         flex: 1;
         font: inherit;
-        border-radius: 2px 0 0 2px;
+        outline: none;
+        padding: 0 .25em;
       }
       gr-button {
         background-color: #f1f2f3;
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index 81915e6a2e..67ab50f7c3 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -61,7 +61,7 @@ limitations under the License.
     <gr-ajax id="diffPreferencesXHR"
         url="/accounts/self/preferences.diff"
         last-response="{{_diffPreferences}}"></gr-ajax>
-    <gr-main-header></gr-main-header>
+    <gr-main-header search-query="{{params.query}}"></gr-main-header>
     <main>
       <template is="dom-if" if="{{_showChangeListView}}" restamp="true">
         <gr-change-list-view
diff --git a/polygerrit-ui/app/styles/app-theme.html b/polygerrit-ui/app/styles/app-theme.html
index df48e8accf..11ea3b4e38 100644
--- a/polygerrit-ui/app/styles/app-theme.html
+++ b/polygerrit-ui/app/styles/app-theme.html
@@ -19,6 +19,7 @@ limitations under the License.
   --primary-text-color: #000;
   --search-border-color: #ddd;
   --secondary-color: #f1f2f3;
+  --selection-background-color: #ebf5fb;
   --default-text-color: #000;
   --view-background-color: #fff;
   --default-horizontal-margin: 1.25rem;

From 1cf6672fac095254aa9339db0d5fca6665f2eb85 Mon Sep 17 00:00:00 2001
From: Andrew Bonventre <andybons@chromium.org>
Date: Wed, 9 Mar 2016 18:36:22 -0500
Subject: [PATCH 3/4] Add user links to nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ Rationale for “My” vs. “Your”: http://dcurt.is/yours-vs-mine
+ Additionally, Your has a larger hit target and My gets lost
  in the UI.

Bug: Issue 3898
Change-Id: Iffcb629d5bf3b67a532e75ee09ccfc5667a0dabc
---
 .../core/gr-main-header/gr-main-header.html   | 27 +++---
 .../core/gr-main-header/gr-main-header.js     | 72 +++++++++++++++
 .../gr-main-header/gr-main-header_test.html   | 89 +++++++++++++++++++
 3 files changed, 177 insertions(+), 11 deletions(-)
 create mode 100644 polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html

diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
index 36f0209be2..af4a0e4dee 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html
@@ -43,13 +43,15 @@ limitations under the License.
         list-style: none;
       }
       .links {
-        margin-left: 2em;
+        margin-left: 1em;
       }
       .links ul {
         display: none;
       }
       .links > li {
         cursor: default;
+        display: inline-block;
+        margin-left: 1em;
         padding: .4em 0;
         position: relative;
       }
@@ -68,6 +70,7 @@ limitations under the License.
         display: block;
         padding: .5em .75em;
         text-decoration: none;
+        white-space: nowrap;
       }
       .links li ul li:hover a {
         background-color: var(--selection-background-color);
@@ -129,16 +132,18 @@ limitations under the License.
     <nav>
       <a href="/" class="bigTitle">PolyGerrit</a>
       <ul class="links">
-        <li>
-          <span class="linksTitle">
-            Changes <i class="downArrow"></i>
-          </span>
-          <ul>
-            <li><a href="/q/status:open">Open</a></li>
-            <li><a href="/q/status:merged">Merged</a></li>
-            <li><a href="/q/status:abandoned">Abandoned</a></li>
-          </ul>
-        </li>
+        <template is="dom-repeat" items="[[_links]]" as="linkGroup">
+          <li>
+            <span class="linksTitle">
+              [[linkGroup.title]] <i class="downArrow"></i>
+            </span>
+            <ul>
+              <template is="dom-repeat" items="[[linkGroup.links]]" as="link">
+                <li><a href="[[link.url]]">[[link.name]]</a></li>
+              </template>
+            </ul>
+          </li>
+        </template>
       </ul>
       <div class="rightItems">
         <gr-search-bar value="{{searchQuery}}" role="search"></gr-search-bar>
diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
index c1b5afe63e..173b88e2e9 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
@@ -14,6 +14,24 @@
 (function() {
   'use strict';
 
+  var DEFAULT_LINKS = [{
+    title: 'Changes',
+    links: [
+      {
+        url: '/q/status:open',
+        name: 'Open',
+      },
+      {
+        url: '/q/status:merged',
+        name: 'Merged',
+      },
+      {
+        url: '/q/status:abandoned',
+        name: 'Abandoned',
+      },
+    ],
+  }];
+
   Polymer({
     is: 'gr-main-header',
 
@@ -28,14 +46,68 @@
       },
 
       _account: Object,
+      _defaultLinks: {
+        type: Array,
+        value: function() {
+          return DEFAULT_LINKS;
+        },
+      },
+      _links: {
+        type: Array,
+        computed: '_computeLinks(_defaultLinks, _userLinks)',
+      },
+      _userLinks: {
+        type: Array,
+        value: function() { return []; },
+      },
     },
 
+    observers: [
+      '_accountLoaded(_account)',
+    ],
+
     attached: function() {
+      this._loadAccount();
+    },
+
+    _computeLinks: function(defaultLinks, userLinks) {
+      var links = defaultLinks.slice();
+      if (userLinks && userLinks.length > 0) {
+        links.push({
+          title: 'Your',
+          links: userLinks,
+        });
+      }
+      return links;
+    },
+
+    _loadAccount: function() {
       this.$.restAPI.getAccount().then(function(account) {
         this._account = account;
         this.$.accountContainer.classList.toggle('loggedIn', account != null);
         this.$.accountContainer.classList.toggle('loggedOut', account == null);
       }.bind(this));
     },
+
+    _accountLoaded: function(account) {
+      if (!account) { return; }
+
+      this.$.restAPI.getPreferences().then(function(prefs) {
+        this._userLinks =
+            prefs.my.map(this._stripHashPrefix).filter(this._isSupportedLink);
+      }.bind(this));
+    },
+
+    _stripHashPrefix: function(linkObj) {
+      if (linkObj.url.indexOf('#') === 0) {
+        linkObj.url = linkObj.url.slice(1);
+      }
+      return linkObj;
+    },
+
+    _isSupportedLink: function(linkObj) {
+      // Groups are not yet supported.
+      return linkObj.url.indexOf('/groups') !== 0;
+    },
   });
 })();
diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html
new file mode 100644
index 0000000000..0b40d87903
--- /dev/null
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header_test.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<!--
+Copyright (C) 2016 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+<title>gr-main-header</title>
+
+<script src="../../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
+<script src="../../../bower_components/web-component-tester/browser.js"></script>
+
+<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
+<link rel="import" href="gr-main-header.html">
+
+<test-fixture id="basic">
+  <template>
+    <gr-main-header></gr-main-header>
+  </template>
+</test-fixture>
+
+<script>
+  suite('gr-main-header tests', function() {
+    var element;
+
+    setup(function() {
+      stub('gr-main-header', {
+        _loadAccount: function() {},
+      });
+      element = fixture('basic');
+    });
+
+    test('strip hash prefix', function() {
+      assert.deepEqual([
+        {url: '#/q/owner:self+is:draft'},
+        {url: 'https://awesometown.com/#hashyhash'},
+      ].map(element._stripHashPrefix),
+      [
+        {url: '/q/owner:self+is:draft'},
+        {url: 'https://awesometown.com/#hashyhash'},
+      ]);
+    });
+
+    test('filter unsupported urls', function() {
+      assert.deepEqual([
+        {url: '/q/owner:self+is:draft'},
+        {url: '/c/331788/'},
+        {url: '/groups/self'},
+        {url: 'https://awesometown.com/#hashyhash'},
+      ].filter(element._isSupportedLink),
+      [
+        {url: '/q/owner:self+is:draft'},
+        {url: '/c/331788/'},
+        {url: 'https://awesometown.com/#hashyhash'},
+      ]);
+    });
+
+    test('user links', function() {
+      var defaultLinks = [{
+        title: 'Faves',
+        links: [{
+          name: 'Pinterest',
+          url: 'https://pinterest.com',
+        }],
+      }];
+      var userLinks = [{
+        name: 'Facebook',
+        url: 'https://facebook.com',
+      }];
+      assert.deepEqual(element._computeLinks(defaultLinks, []), defaultLinks);
+      assert.deepEqual(element._computeLinks(defaultLinks, userLinks),
+          defaultLinks.concat({
+            title: 'Your',
+            links: userLinks,
+          }));
+    });
+  });
+</script>

From e37793393417f6f9f5555d2c0c2c7cbf6571c030 Mon Sep 17 00:00:00 2001
From: Andrew Bonventre <andybons@chromium.org>
Date: Wed, 9 Mar 2016 20:47:05 -0500
Subject: [PATCH 4/4] Fix bug where a Promise was not returned by the shared
 cache

+ Kudos for Urs Wolfer for the fix and test.

Change-Id: I6f812fb5ff2904f5e2b9e6e293bdedab04b4b378
---
 .../gr-rest-api-interface/gr-rest-api-interface.js |  2 +-
 .../gr-rest-api-interface_test.html                | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index 5c7ae3afa5..09b6d35d45 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -96,7 +96,7 @@
       }
       // TODO(andybons): Periodic cache invalidation.
       if (this._cache[url] !== undefined) {
-        return this._cache[url];
+        return Promise.resolve(this._cache[url]);
       }
       this._sharedFetchPromises[url] = this.fetchJSON(url).then(
         function(response) {
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
index c397c8f68e..b0a66493a3 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html
@@ -65,7 +65,19 @@ limitations under the License.
 
       Promise.all(promises).then(function(results) {
         assert.deepEqual(results, [1, 1, 1]);
-        fetchJSONStub.restore();
+         element._fetchSharedCacheURL('/foo').then(function(foo) {
+          assert.equal(foo, 1);
+          fetchJSONStub.restore();
+          done();
+        });
+      });
+    });
+
+    test('cached promise', function(done) {
+      var promise = Promise.reject('foo');
+      element._cache['/foo'] = promise;
+      element._fetchSharedCacheURL('/foo').catch(function(p) {
+        assert.equal(p, 'foo');
         done();
       });
     });