commit 64a48355900d60df670b719235d9091fa056ad5d
author Dominik Röttsches <drott@chromium.org> Tue Apr 30 07:54:14 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 30 07:54:14 2019
tree 4885a5cd78b2a482a13d719b1ca15990e4df85c6
parent 54b56964fefcb90da52b6258763a21343383057b

Revert "Repeat checks for menu items in PluginVm uitest to fix flakes"

This reverts commit 30ef509ffb1d8887a27ebfd42a15e8ff90107e1c.

Reason for revert: Blocks revert of https://chromium-review.googlesource.com/c/chromium/src/+/1589075

Original change's description:
> Repeat checks for menu items in PluginVm uitest to fix flakes
> 
> Bug: 955920
> Change-Id: I080dea146c773354d9ec7b00f3ea8c95c17ebc21
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1588060
> Commit-Queue: Joel Hockey <joelhockey@chromium.org>
> Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#655146}

TBR=joelhockey@chromium.org,lucmult@chromium.org

Change-Id: Ie56bc5b32103a23bb2b0df0f7d8a3f2973199de5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 955920
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1588581
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655155}

ui/file_manager/file_manager/test/plugin_vm.js

diff --git a/ui/file_manager/file_manager/test/plugin_vm.js b/ui/file_manager/file_manager/test/plugin_vm.js
index 858c0e0..05c978c 100644
--- a/ui/file_manager/file_manager/test/plugin_vm.js
+++ b/ui/file_manager/file_manager/test/plugin_vm.js
@@ -31,7 +31,6 @@
   ];
 
   const pluginVmFolder = '#file-list [file-name="PluginVm"]';
-  const photosSubfolder = '#file-list [file-name="photos"]';
   const iconFolder =
       '#file-list [file-name="PluginVm"] [file-type-icon="plugin_vm"]';
   const fileMenuShown = '#file-context-menu:not([hidden])';
@@ -40,19 +39,11 @@
   const dirTreeMenuShown = '#directory-tree-context-menu:not([hidden])';
   const itemsShown = ' cr-menu-item:not([hidden])';
 
-  async function waitForMenuItems(rightClick, menuTypeShown, expectedItems) {
-    const expected = JSON.stringify(expectedItems);
-    return test.repeatUntil(() => {
-      assertTrue(test.fakeMouseRightClick(rightClick));
-      const items =
-          Array.from(document.querySelectorAll(menuTypeShown + itemsShown))
-              .map(e => [e.attributes['command'].value, !e.disabled]);
-      const actual = JSON.stringify(items);
-      return expected === actual ||
-          test.pending(
-              'Waiting for context menu, expected: %s, actual: %s', expected,
-              actual);
-    });
+  async function menuItems(menuTypeShown) {
+    await test.waitForElement(menuTypeShown);
+    const list = document.querySelectorAll(menuTypeShown + itemsShown);
+    return Array.from(document.querySelectorAll(menuTypeShown + itemsShown))
+        .map(e => [e.attributes['command'].value, !e.disabled]);
   }
 
   // Verify that /PluginVm has label 'Plugin VM'.
@@ -74,7 +65,9 @@
   await test.waitForElement(iconFolder);
 
   // Verify /PluginVm folder context menu.
-  await waitForMenuItems(pluginVmFolder, fileMenuShown, fileMenu);
+  assertTrue(test.fakeMouseRightClick(pluginVmFolder));
+  let items = await menuItems(fileMenuShown);
+  assertEquals(JSON.stringify(fileMenu), JSON.stringify(items));
 
   // Change to 'PluginVm' directory, photos folder is shown.
   assertTrue(test.fakeMouseDoubleClick(pluginVmFolder));
@@ -82,7 +75,9 @@
       test.TestEntryInfo.getExpectedRows([test.ENTRIES.photos]));
 
   // Verify /PluginVm/photos folder context menu.
-  await waitForMenuItems(photosSubfolder, fileMenuShown, fileMenuSubfolder);
+  assertTrue(test.fakeMouseRightClick('#file-list [file-name="photos"]'));
+  items = await menuItems(fileMenuShown);
+  assertEquals(JSON.stringify(fileMenuSubfolder), JSON.stringify(items));
 
   done();
-};
+};
\ No newline at end of file