From 1f25750cf7d25562ca5e8fa54b97070a823ca11d Mon Sep 17 00:00:00 2001
From: Becky Siegel <beckysiegel@google.com>
Date: Wed, 14 Jun 2017 13:19:32 -0700
Subject: [PATCH] Fix flaky test in plugin list

Change-Id: I2c37ac77639d13f525d14de1d1ae97c5fb13ff15
---
 .../gr-admin-plugin-list.js                   |  5 ++-
 .../gr-admin-plugin-list_test.html            | 33 ++++++-------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js
index 1885bb0047..00401a5078 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list.js
@@ -30,6 +30,10 @@
     ],
 
     ready() {
+      this._getPlugins();
+    },
+
+    _getPlugins() {
       return this.$.restAPI.getPlugins()
           .then(plugins => {
             if (!plugins) {
@@ -46,7 +50,6 @@
           });
     },
 
-
     _status(item) {
       return item.disabled === true ? 'Disabled' : 'Enabled';
     },
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html
index b946854425..0969b84461 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-admin-plugin-list/gr-admin-plugin-list_test.html
@@ -50,6 +50,10 @@ limitations under the License.
 
     setup(() => {
       sandbox = sinon.sandbox.create();
+      plugins = _.times(26, pluginGenerator);
+      stub('gr-rest-api-interface', {
+        getPlugins() { return Promise.resolve(plugins); },
+      });
       element = fixture('basic');
     });
 
@@ -57,29 +61,12 @@ limitations under the License.
       sandbox.restore();
     });
 
-    suite('list with plugins', () => {
-      setup(done => {
-        plugins = _.times(26, pluginGenerator);
-
-        stub('gr-rest-api-interface', {
-          getPlugins() {
-            return Promise.resolve(plugins);
-          },
-        });
-
-        flush(done);
-      });
-
-      test('test for a test plugin in the list', done => {
-        element._plugins = plugins;
-
-        flush(() => {
-          assert.equal(element._plugins[2].id, 'test3');
-          assert.equal(element._plugins[2].index_url, 'plugins/test3/');
-          assert.equal(element._plugins[2].version, '3.0-SNAPSHOT');
-          assert.equal(element._plugins[2].disabled, false);
-          done();
-        });
+    test('_plugins item is formatted correctly', () => {
+      return element._getPlugins().then(() => {
+        assert.equal(element._plugins[2].id, 'test3');
+        assert.equal(element._plugins[2].index_url, 'plugins/test3/');
+        assert.equal(element._plugins[2].version, '3.0-SNAPSHOT');
+        assert.equal(element._plugins[2].disabled, false);
       });
     });
   });