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

Commit

Permalink
Merge pull request #4919 from bsclifton/fix-history-doubleclick
Browse files Browse the repository at this point in the history 
History page now properly opens new tab w/ link that was clicked
  • Loading branch information
@darkdh
darkdh authored Oct 18, 2016
2 parents 0dc00d6 + b7208b9 commit 75c3880
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 75 deletions.
4 changes: 2 additions & 2 deletions js/about/history.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class HistoryTimeCell extends ImmutableComponent {
class HistoryDay extends ImmutableComponent {
navigate (entry) {
aboutActions.newFrame({
location: entry.location,
partitionNumber: entry.partitionNumber
location: entry.get('location'),
partitionNumber: entry.get('partitionNumber')
})
}
render () {
Expand Down
169 changes: 96 additions & 73 deletions test/about/historyTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ describe('about:history', function () {
Brave.beforeAll(this)

before(function * () {
const page1 = Brave.server.url('page1.html')

yield this.app.client
.waitForUrl(Brave.newTabUrl)
.waitForBrowserWindow()
.waitForVisible(urlInput)
.windowByUrl(Brave.browserWindowUrl)
.addSite({ location: page1, title: 'Page 1' })
.addSite({ location: 'https://brave.com', title: 'Brave' })
.addSite({ location: 'https://brave.com/test', customTitle: 'customTest' })
.addSite({ location: 'https://www.youtube.com' })
Expand All @@ -39,79 +42,99 @@ describe('about:history', function () {
.waitForVisible('table.sortableTable thead tr th.sort-up div[data-l10n-id="time"]')
})

// Multi Select
it('Simulate cmd/control click behavior', function * () {
yield this.app.client
.tabByUrl(aboutHistoryUrl)
.click('table.sortableTable td.title[data-sort="Brave"]')
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
// key depressed
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
// reset state
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
describe('double click', function () {
it('opens a new tab with the location of the entry when double clicked', function * () {
const page1 = Brave.server.url('page1.html')

yield this.app.client
.tabByUrl(aboutHistoryUrl)
.doubleClick('table.sortableTable td.title[data-sort="Page 1"]')
.waitUntil(function () {
return this.getTabCount().then((count) => {
return count === 2
})
})
.waitForUrl(page1)
.tabByIndex(0)
})
})
it('Simulate shift click behavior', function * () {
yield this.app.client
.tabByUrl(aboutHistoryUrl)
.click('table.sortableTable td.title[data-sort="Brave"]')
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
// key depressed
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
// key depressed
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
// reset state
// key depressed
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="Brave"]')

describe('multi-select', function () {
it('selects multiple rows when clicked with cmd/control', function * () {
yield this.app.client
.tabByUrl(aboutHistoryUrl)
.loadUrl(aboutHistoryUrl)
.click('table.sortableTable td.title[data-sort="Brave"]')
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
// key depressed
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
// reset state
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
})
it('selects multiple contiguous rows when shift clicked', function * () {
yield this.app.client
.tabByUrl(aboutHistoryUrl)
.loadUrl(aboutHistoryUrl)
.click('table.sortableTable td.title[data-sort="Brave"]')
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
// key depressed
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
// key depressed
.isDarwin().then((val) => {
if (val === true) {
return this.app.client.keys(Brave.keys.COMMAND)
} else {
return this.app.client.keys(Brave.keys.CONTROL)
}
})
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
.waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
// reset state
// key depressed
.keys(Brave.keys.SHIFT)
.click('table.sortableTable td.title[data-sort="Brave"]')
})
})
})

0 comments on commit 75c3880

Please sign in to comment.