fix failing tests, preserve options passed into menu.set({})

cypress-io · Oct 29, 2021 · 2bcf65f · 2bcf65f
1 parent 8073ac6
commit 2bcf65f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/packages/server/lib/gui/menu.js b/packages/server/lib/gui/menu.js
@@ -6,20 +6,14 @@ const { shell } = require('electron')
 const appData = require('../util/app_data')
 const open = require('../util/open')
 
-// let onLogOutClicked = function () {}
+// hoist up options and allow calling menu.set({})
+// to override existing options or be called multiple
+// times to preserve existing options
 let options = {}
 
 module.exports = {
   set (opts = {}) {
-    _.defaults(options, opts, {
-      withDevTools: false,
-    })
-
-    // // this set by modes/interactive and needs to be preserved if the menu
-    // // is set again by launcher when the Electron browser is run
-    // if (options.onLogOutClicked) {
-    //   ({ onLogOutClicked } = options)
-    // }
+    _.extend(options, opts)
 
     const template = [
       {

diff --git a/packages/server/lib/modes/interactive-e2e.ts b/packages/server/lib/modes/interactive-e2e.ts
@@ -138,7 +138,6 @@ export = {
     // instance here instead of callback functions
     menu.set({
       withDevTools: isDev(),
-      withGraphiQL: isDev(),
       onLogOutClicked () {
         return bus.emit('menu:item:clicked', 'log:out')
       },

diff --git a/packages/server/test/unit/gui/menu_spec.js b/packages/server/test/unit/gui/menu_spec.js
@@ -91,6 +91,20 @@ describe('gui/menu', function () {
       expect(onLogOutClicked).to.be.called
     })
 
+    it('merges options and calls callback functions', () => {
+      const onLogOutClicked1 = sinon.stub()
+      const onLogOutClicked2 = sinon.stub()
+
+      menu.set()
+      menu.set({ onLogOutClicked: onLogOutClicked1 })
+      menu.set({ onLogOutClicked: onLogOutClicked2 })
+
+      getSubMenuItem(getMenuItem('File'), 'Log Out').click()
+
+      expect(onLogOutClicked1).not.to.be.called
+      expect(onLogOutClicked2).to.be.called
+    })
+
     it('calls original logout callback when menu is reset without new callback', () => {
       const onLogOutClicked = sinon.stub()
 
@@ -260,6 +274,8 @@ describe('gui/menu', function () {
         expect(labels).to.eql([
           'Reload',
           'Toggle Developer Tools',
+          'GraphiQL',
+          'View App Data',
         ])
       })