Preserve session/private for open image

Auditors: @diracdeltas Fix #2746
brave · Jul 28, 2016 · 066adc4 · 066adc4 · diracdeltas · Jul 28, 2016
1 parent cb3c161
commit 066adc4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/js/components/main.js b/js/components/main.js
@@ -224,12 +224,16 @@ class Main extends ImmutableComponent {
       const activeFrame = FrameStateUtil.getActiveFrame(self.props.windowState)
 
       let openInForeground = getSetting(settings.SWITCH_TO_NEW_TABS) === true || options.openInForeground
-      windowActions.newFrame({
+      const frameOpts = {
         location: url || config.defaultUrl,
         isPrivate: !!options.isPrivate,
         isPartitioned: !!options.isPartitioned,
         parentFrameKey: activeFrame.get('key')
-      }, openInForeground)
+      }
+      if (options.partitionNumber !== undefined) {
+        frameOpts.partitionNumber = options.partitionNumber
+      }
+      windowActions.newFrame(frameOpts, openInForeground)
     })
 
     ipc.on(messages.NEW_POPUP_WINDOW, function (evt, extensionId, src, props) {

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -759,7 +759,7 @@ function mainTemplateInit (nodeProps, frame) {
         click: (item, focusedWindow) => {
           if (focusedWindow && nodeProps.srcURL) {
             // TODO: open this in the next tab instead of last tab
-            focusedWindow.webContents.send(messages.SHORTCUT_NEW_FRAME, nodeProps.srcURL)
+            focusedWindow.webContents.send(messages.SHORTCUT_NEW_FRAME, nodeProps.srcURL, { isPrivate: frame.get('isPrivate'), partitionNumber: frame.get('partitionNumber') })
           }
         }
       },

diff --git a/test/components/tabTest.js b/test/components/tabTest.js
@@ -73,6 +73,26 @@ describe('tabs', function () {
     })
   })
 
+  describe('specific session tab signal', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+      var url = Brave.server.url('page1.html')
+      yield this.app
+        .client.ipcSend(messages.SHORTCUT_NEW_FRAME, url, { partitionNumber: 3 })
+        .waitForUrl(url)
+        .windowByUrl(Brave.browserWindowUrl)
+    })
+    it('creates a new session tab', function * () {
+      yield this.app.client
+        .waitForExist('.tab[data-frame-key="2"]')
+    })
+    it('makes the new session webview visible', function * () {
+      yield this.app.client
+        .waitForVisible('webview[partition="persist:partition-3"]')
+    })
+  })
+
   describe('close tab', function () {
     var tabCountBeforeTabClose = 2
     var tabCountAfterTabClose = 1