Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Add a test for case insensitive repo search
  Fix regression - enable insensitive search for repo search

Change-Id: Icfa4ae561869709591fc74255a1478a457301b5d

2 files changed, 20 insertions, 7 deletions

diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
index 1f33b250a6..1dd28e8765 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
@@ -152,7 +152,9 @@ class GrRepoList extends mixinBehaviors( [
         .then(repos => {
           // Late response.
           if (filter !== this._filter || !repos) { return; }
-          this._repos = repos.filter(repo => repo.name.includes(filter));
+          this._repos = repos.filter(repo =>
+            repo.name.toLowerCase().includes(filter.toLowerCase())
+          );
           this._loading = false;
         });
   }
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
index e848980e84..4b1a2afff7 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
@@ -37,20 +37,22 @@ import '../../../test/common-test-setup.js';
 import './gr-repo-list.js';
 import page from 'page/page.mjs';
 
-let counter;
-const repoGenerator = () => {
+function createRepo(name, counter) {
   return {
-    id: `test${++counter}`,
-    name: `test`,
+    id: `${name}${counter}`,
+    name: `${name}`,
     state: 'ACTIVE',
     web_links: [
       {
         name: 'diffusion',
-        url: `https://phabricator.example.org/r/project/test${counter}`,
+        url: `https://phabricator.example.org/r/project/${name}${counter}`,
       },
     ],
   };
-};
+}
+
+let counter;
+const repoGenerator = () => createRepo('test', ++counter);
 
 suite('gr-repo-list tests', () => {
   let element;
@@ -154,6 +156,15 @@ suite('gr-repo-list tests', () => {
         done();
       });
     });
+
+    test('filter is case insensitive', async () => {
+      const repoStub = sandbox.stub(element.$.restAPI, 'getRepos');
+      const repos = [createRepo('aSDf', 0)];
+      repoStub.withArgs('asdf').returns(Promise.resolve(repos));
+      element._filter = 'asdf';
+      await element._getRepos('asdf', 25, 0);
+      assert.equal(element._repos.length, 1);
+    });
   });
 
   suite('loading', () => {