Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Always switch back to active tab after sequentially closing tabs #9539

Merged
merged 2 commits into from
Jun 20, 2017
Merged

Always switch back to active tab after sequentially closing tabs #9539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb7906b
Add test case for sequentially closing tabs
cezaraugusto Jun 17, 2017
f69209b
check to see if the tab was active before it was closed
bridiver Jun 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/browser/reducers/tabsReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ const updateActiveTab = (state, closeTabId) => {
return
}

if (!tabState.isActive(state, closeTabId)) {
const windowId = tabState.getWindowId(state, closeTabId)
if (windowId === windowState.WINDOW_ID_NONE) {
return
}

const windowId = tabState.getWindowId(state, closeTabId)
if (windowId === windowState.WINDOW_ID_NONE) {
const lastActiveTabId = tabState.getTabsByLastActivated(state, windowId).last()
if (lastActiveTabId !== closeTabId && !tabState.isActive(state, closeTabId)) {
return
}

Expand Down
35 changes: 34 additions & 1 deletion test/tab-components/tabTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,40 @@ describe('tab tests', function () {
})
})

describe('sequentially closing tabs', function () {
Brave.beforeAll(this)
before(function * () {
const page1 = Brave.server.url('adblock2.html')
const page2 = Brave.server.url('red_bg.html')
const page3 = Brave.server.url('yellow_header.html')

yield setup(this.app.client)
yield this.app.client
.newTab({ url: page1 })
.waitForUrl(page1)
.windowByUrl(Brave.browserWindowUrl)
.waitForExist('[data-test-id="tab"][data-frame-key="2"]')
.newTab({ url: page2 })
.waitForUrl(page2)
.windowByUrl(Brave.browserWindowUrl)
.waitForExist('[data-test-id="tab"][data-frame-key="3"]')
.newTab({ url: page3 })
.waitForUrl(page3)
.windowByUrl(Brave.browserWindowUrl)
.waitForExist('[data-test-id="tab"][data-frame-key="4"]')
})

it('fallsback to last active tab if next tab does not exist', function * () {
yield this.app.client.changeSetting(settings.SHOW_TAB_PREVIEWS, false)
yield this.app.client
.moveToObject('[data-test-id="tab"][data-frame-key="3"]')
.middleClick('[data-test-id="tab"][data-frame-key="3"]')
.moveToObject('[data-test-id="tab"][data-frame-key="4"]')
.middleClick('[data-test-id="tab"][data-frame-key="4"]')
.waitForVisible('[data-test-active-tab="true"][data-frame-key="2"]')
})
})

describe('webview previews when tab is hovered', function () {
Brave.beforeAll(this)
before(function * () {
Expand Down Expand Up @@ -432,7 +466,6 @@ describe('tab tests', function () {
.click('[data-test-id="tab"][data-frame-key="2"]')
.moveToObject('[data-test-id="tab"][data-frame-key="5"]')
.middleClick('[data-test-id="tab"][data-frame-key="5"]')
.waitForExist('.frameWrapper.isPreview webview')
// no preview should be shown
.waitForVisible('.frameWrapper.isPreview webview', 500, true)
})
Expand Down