Merge branch 'stable-2.16'

* stable-2.16:
  Add getConfig() method to plugin restApi interface

Change-Id: I3ded71856e12947f9bcc7e428f67ca3ed19d0e1d

2 files changed, 14 insertions, 1 deletions

diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api.js
index 76e200e56f..f85619e37f 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api.js
@@ -38,6 +38,10 @@
     return getRestApi().getVersion();
   };
 
+  GrPluginRestApi.prototype.getConfig = function() {
+    return getRestApi().getConfig();
+  };
+
   GrPluginRestApi.prototype.invalidateReposCache = function() {
     getRestApi().invalidateReposCache();
   };
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
index 59836214ea..7a59337771 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
@@ -42,6 +42,7 @@ limitations under the License.
         send: sendStub,
         getLoggedIn: sandbox.stub(),
         getVersion: sandbox.stub(),
+        getConfig: sandbox.stub(),
       };
       stub('gr-rest-api-interface', Object.keys(restApiStub).reduce((a, k) => {
         a[k] = (...args) => restApiStub[k](...args);
@@ -133,12 +134,20 @@ limitations under the License.
       });
     });
 
-    test('getConfig', () => {
+    test('getVersion', () => {
       restApiStub.getVersion.returns(Promise.resolve('foo bar'));
       return instance.getVersion().then(result => {
         assert.isTrue(restApiStub.getVersion.calledOnce);
         assert.equal(result, 'foo bar');
       });
     });
+
+    test('getConfig', () => {
+      restApiStub.getConfig.returns(Promise.resolve('foo bar'));
+      return instance.getConfig().then(result => {
+        assert.isTrue(restApiStub.getConfig.calledOnce);
+        assert.equal(result, 'foo bar');
+      });
+    });
   });
 </script>