Allow deleting folder from add/edit

Auditors: @bsclifton Fix #3409
brave · Aug 27, 2016 · 608f4e8 · 608f4e8
1 parent c2b3ab3
commit 608f4e8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/js/components/addEditBookmark.js b/js/components/addEditBookmark.js
@@ -113,7 +113,8 @@ class AddEditBookmark extends ImmutableComponent {
     this.onClose()
   }
   onRemoveBookmark () {
-    appActions.removeSite(this.props.currentDetail, siteTags.BOOKMARK)
+    const tag = this.isFolder ? siteTags.BOOKMARK_FOLDER : siteTags.BOOKMARK
+    appActions.removeSite(this.props.currentDetail, tag)
     this.updateMenuBookmarkedStatus(false)
     this.onClose()
   }

diff --git a/test/components/bookmarksTest.js b/test/components/bookmarksTest.js
@@ -1,7 +1,7 @@
 /* global describe, it, before */
 
 const Brave = require('../lib/brave')
-const {urlInput, navigator, navigatorNotBookmarked, saveButton} = require('../lib/selectors')
+const {urlInput, navigator, navigatorNotBookmarked, saveButton, deleteButton} = require('../lib/selectors')
 
 describe('bookmarks', function () {
   function * setup (client) {
@@ -56,6 +56,19 @@ describe('bookmarks', function () {
               .then((val) => val === 'Page 1')
           })
       })
+
+      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)
+        })
+      })
     })
   })
 
@@ -103,6 +116,18 @@ describe('bookmarks', function () {
               .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)
+        })
+      })
     })
   })
 })
diff --git a/test/lib/selectors.js b/test/lib/selectors.js
@@ -46,6 +46,7 @@ module.exports = {
   clearBrowsingDataButton: '.clearBrowsingDataButton',
   securityTab: '[data-l10n-id="security"]',
   saveButton: '[data-l10n-id="save"]',
+  deleteButton: '[data-l10n-id="delete"]',
   autofillAddressPanel: '.autofillAddressPanel',
   autofillCreditCardPanel: '.autofillCreditCardPanel'
 }