Bug 1557979 - Follow-up: Fix 'page menu' and re-enable check. rs=bustage-fix

mail/base/content/nsContextMenu.js

@@ -83,6 +83,7 @@ nsContextMenu.prototype = {
     if (!aIsShift) {
       let menuObject = PageMenuParent.maybeBuild(this.target);
       PageMenuParent.addToPopup(menuObject, null, aPopup);
+      this.hasPageMenu = true;
 
       let subject = {
         menu: aPopup,

mail/test/mozmill/content-tabs/test-content-tab.js

@@ -110,7 +110,7 @@ function test_content_tab_context_menu() {
                              w);
   wait_for_popup_to_open(mailContext);
   assert_equals(mailContext.firstChild.label, "Click me!");
-  // See bug 1557979: assert_element_visible("page-menu-separator");
+  assert_element_visible("page-menu-separator");
   close_popup(mc, new elementslib.Elem(mailContext));
 
   // Make sure the page's menu items are *not* added on shift-right-click.