commit 61534ab73bd98605a532301a6d8957bd8a652695
author Ben Rohlfs <brohlfs@google.com> Thu Jul 11 07:16:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 11 07:16:05 2019 +0000
tree b8d70f48c9373267a7f47442003d9c8e372409e3
parent 3bf18c61c38ed1e9ca452e03574bea7507f28871
parent 8ad03111249f2664654ca3c7e6990f4e034b26dc

Merge "Fix gr-repo test under Polymer 2"

polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html

diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
index 05fb221..52f143c 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
@@ -271,6 +271,7 @@
                 <span class="title">Maximum Git object size limit</span>
                 <span class="value">
                   <iron-input
+                      id="maxGitObjSizeIronInput"
                       bind-value="{{_repoConfig.max_object_size_limit.configured_value}}"
                       type="text"
                       disabled$="[[_readOnly]]">

polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.html

diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.html b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.html
index 0ac1834..53db6d5 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.html
@@ -364,8 +364,9 @@
               configInputObj.private_by_default;
           element.$.matchAuthoredDateWithCommitterDateSelect.bindValue =
               configInputObj.match_author_to_committer_date;
-          element.$.maxGitObjSizeInput.bindValue =
-              configInputObj.max_object_size_limit;
+          const inputElement = Polymer.Element ?
+              element.$.maxGitObjSizeIronInput : element.$.maxGitObjSizeInput;
+          inputElement.bindValue = configInputObj.max_object_size_limit;
           element.$.contributorAgreementSelect.bindValue =
               configInputObj.use_contributor_agreements;
           element.$.useSignedOffBySelect.bindValue =