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

Update menu.js to rebuild when handling (add/remove) bookmark folders #4390

Merged
merged 1 commit into from
Oct 4, 2016
Merged

Update menu.js to rebuild when handling (add/remove) bookmark folders #4390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/browser/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,14 +616,14 @@ const doAction = (action) => {
})
break
case appConstants.APP_ADD_SITE:
if (action.tag === siteTags.BOOKMARK) {
if (action.tag === siteTags.BOOKMARK || action.tag === siteTags.BOOKMARK_FOLDER) {
appDispatcher.waitFor([appStore.dispatchToken], () => {
createMenu()
})
}
break
case appConstants.APP_REMOVE_SITE:
if (action.tag === siteTags.BOOKMARK) {
if (action.tag === siteTags.BOOKMARK || action.tag === siteTags.BOOKMARK_FOLDER) {
appDispatcher.waitFor([appStore.dispatchToken], () => {
createMenu()
})
Expand Down
4 changes: 2 additions & 2 deletions docs/state.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ AppStore
gridLayout: string // 'small', 'medium', 'large'
}
},
menubar: {
template: object // windows only: template object with Menubar control
menu: {
template: object // used on Windows and by our tests: template object with Menubar control
}
}
```
Expand Down
233 changes: 148 additions & 85 deletions test/components/bookmarksTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

const Brave = require('../lib/brave')
const {urlInput, navigator, navigatorNotBookmarked, saveButton, deleteButton} = require('../lib/selectors')
const siteTags = require('../../js/constants/siteTags')

describe('bookmarks', function () {
describe('bookmark tests', function () {
function * setup (client) {
yield client
.waitUntilWindowLoaded()
Expand All @@ -13,125 +14,187 @@ describe('bookmarks', function () {
.waitForEnabled(urlInput)
}

describe('with title', function () {
Brave.beforeAll(this)
describe('bookmarks', function () {
describe('pages with title', function () {
Brave.beforeAll(this)

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

yield setup(this.app.client)
yield setup(this.app.client)

yield this.app.client
.waitForUrl(Brave.newTabUrl)
.loadUrl(this.page1Url)
.windowParentByUrl(this.page1Url)
.waitForVisible(navigator)
.moveToObject(navigator)
.waitForVisible(navigatorNotBookmarked)
.click(navigatorNotBookmarked)
.waitForVisible(saveButton)
})
yield this.app.client
.waitForUrl(Brave.newTabUrl)
.loadUrl(this.page1Url)
.windowParentByUrl(this.page1Url)
.waitForVisible(navigator)
.moveToObject(navigator)
.waitForVisible(navigatorNotBookmarked)
.click(navigatorNotBookmarked)
.waitForVisible(saveButton)
})

it('fills in the title field', function * () {
yield this.app.client
.waitForExist('#bookmarkName input')
.getValue('#bookmarkName input').should.eventually.be.equal('Page 1')
})
it('fills in the title field', function * () {
yield this.app.client
.waitForExist('#bookmarkName input')
.getValue('#bookmarkName input').should.eventually.be.equal('Page 1')
})

it('fills in the url field', function * () {
yield this.app.client
.waitForExist('#bookmarkLocation input')
.getValue('#bookmarkLocation input').should.eventually.be.equal(this.page1Url)
it('fills in the url field', function * () {
yield this.app.client
.waitForExist('#bookmarkLocation input')
.getValue('#bookmarkLocation input').should.eventually.be.equal(this.page1Url)
})

describe('saved with a title', function () {
before(function * () {
yield this.app.client
.click(saveButton)
})

it('displays title', function * () {
yield this.app.client
.waitUntil(function () {
return this.getText('.bookmarkText')
.then((val) => val === 'Page 1')
})
})

describe('and then removed', function () {
before(function * () {
yield this.app.client
.waitForVisible(navigator)
.moveToObject(navigator)
.waitForVisible(navigatorNotBookmarked)
.click(navigatorNotBookmarked)
.waitForVisible(deleteButton)
.click(deleteButton)
})
it('removes the bookmark from the toolbar', function * () {
yield this.app.client
.waitForExist('.bookmarkText', 1000, true)
})
})
})
})

describe('saved with a title', function () {
describe('pages without title', function () {
Brave.beforeAll(this)

before(function * () {
this.page1Url = Brave.server.url('page_no_title.html')

yield setup(this.app.client)

yield this.app.client
.click(saveButton)
.waitForUrl(Brave.newTabUrl)
.loadUrl(this.page1Url)
.windowParentByUrl(this.page1Url)
.moveToObject(navigator)
.waitForExist(navigatorNotBookmarked)
.moveToObject(navigator)
.click(navigatorNotBookmarked)
.waitForVisible(saveButton + ':not([disabled]')
})

it('displays title', function * () {
it('leaves the title field blank', function * () {
yield this.app.client
.waitUntil(function () {
return this.getText('.bookmarkText')
.then((val) => val === 'Page 1')
})
.waitForExist('#bookmarkName input')
.getValue('#bookmarkName input').should.eventually.be.equal('')
})

describe('and then removed', function () {
it('fills in the url field', function * () {
yield this.app.client
.waitForExist('#bookmarkLocation input')
.getValue('#bookmarkLocation input').should.eventually.be.equal(this.page1Url)
})

describe('saved without a title', function () {
before(function * () {
yield this.app.client
.waitForVisible(navigator)
.moveToObject(navigator)
.waitForVisible(navigatorNotBookmarked)
.click(navigatorNotBookmarked)
.waitForVisible(deleteButton)
.click(deleteButton)
.click(saveButton)
})
it('removes the bookmark from the toolbar', function * () {
it('displays URL', function * () {
const page1Url = this.page1Url
yield this.app.client
.waitForExist('.bookmarkText', 1000, true)
.waitUntil(function () {
return this.getText('.bookmarkText')
.then((val) => val === page1Url)
})
})
describe('and then removed', function () {
before(function * () {
yield this.app.client
.click(navigatorNotBookmarked)
.waitForExist(deleteButton)
.click(deleteButton)
})
it('removes the bookmark from the toolbar', function * () {
yield this.app.client
.waitForExist('.bookmarkText', 1000, true)
})
})
})
})
})

describe('without title', function () {
describe('menu behavior', function () {
Brave.beforeAll(this)

before(function * () {
this.page1Url = Brave.server.url('page_no_title.html')

yield setup(this.app.client)

yield this.app.client
.waitForUrl(Brave.newTabUrl)
.loadUrl(this.page1Url)
.windowParentByUrl(this.page1Url)
.moveToObject(navigator)
.waitForExist(navigatorNotBookmarked)
.moveToObject(navigator)
.click(navigatorNotBookmarked)
.waitForVisible(saveButton + ':not([disabled]')
})

it('leaves the title field blank', function * () {
yield this.app.client
.waitForExist('#bookmarkName input')
.getValue('#bookmarkName input').should.eventually.be.equal('')
})
it('rebuilds the menu when a folder is added', function * () {
const folderName = 'bookmark-folder-rebuild-menu-demo'

it('fills in the url field', function * () {
yield this.app.client
.waitForExist('#bookmarkLocation input')
.getValue('#bookmarkLocation input').should.eventually.be.equal(this.page1Url)
.addSite({
customTitle: folderName,
folderId: 1,
parentFolderId: 0,
tags: [siteTags.BOOKMARK_FOLDER]
}, siteTags.BOOKMARK_FOLDER)
.waitUntil(function () {
return this.getAppState().then((val) => {
const bookmarksMenu = val.value.menu.template.find((item) => {
return item.label === 'Bookmarks'
})
if (bookmarksMenu && bookmarksMenu.submenu) {
const bookmarkFolder = bookmarksMenu.submenu.find((item) => {
return item.label === folderName
})
if (bookmarkFolder) return true
}
return false
})
})
})

describe('saved without a title', function () {
before(function * () {
yield this.app.client
.click(saveButton)
})
it('displays URL', function * () {
const page1Url = this.page1Url
yield this.app.client
.waitUntil(function () {
return this.getText('.bookmarkText')
.then((val) => val === page1Url)
it('rebuilds the menu when a bookmark is added', function * () {
const bookmarkTitle = 'bookmark-rebuild-menu-demo'

yield this.app.client
.addSite({
lastAccessedTime: 456,
tags: [siteTags.BOOKMARK],
location: 'https://brave.com',
title: bookmarkTitle
}, siteTags.BOOKMARK)
.waitUntil(function () {
return this.getAppState().then((val) => {
const bookmarksMenu = val.value.menu.template.find((item) => {
return item.label === 'Bookmarks'
})
if (bookmarksMenu && bookmarksMenu.submenu) {
const bookmark = bookmarksMenu.submenu.find((item) => {
return item.label === bookmarkTitle
})
if (bookmark) return true
}
return false
})
})
describe('and then removed', function () {
before(function * () {
yield this.app.client
.click(navigatorNotBookmarked)
.waitForExist(deleteButton)
.click(deleteButton)
})
it('removes the bookmark from the toolbar', function * () {
yield this.app.client
.waitForExist('.bookmarkText', 1000, true)
})
})
})
})
})