blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1967: Multi-selection toolbar should disappear after deleting (#2202)

master
Colin Lee 2019-05-01 13:51:37 -05:00 committed by GitHub
parent 6cff7325dd
commit a60d2c071c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkComponent.kt
View File

@ -32,9 +32,10 @@ class BookmarkComponent(
is BookmarkChange.Change -> {
val mode =
if (state.mode is BookmarkState.Mode.Selecting) {
BookmarkState.Mode.Selecting(state.mode.selectedItems.filter {
val items = state.mode.selectedItems.filter {
it in change.tree
}.toSet())
}.toSet()
if (items.isEmpty()) BookmarkState.Mode.Normal else BookmarkState.Mode.Selecting(items)
} else state.mode
state.copy(tree = change.tree, mode = mode)
}

27
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkComponentTest.kt
View File

@ -22,7 +22,7 @@ import org.mozilla.fenix.mvi.getManagedEmitter
class BookmarkComponentTest {
private lateinit var bookmarkComponent: BookmarkComponentTest.TestBookmarkComponent
private lateinit var bookmarkComponent: TestBookmarkComponent
private lateinit var bookmarkObserver: TestObserver<BookmarkState>
private lateinit var emitter: Observer<BookmarkChange>
@ -32,7 +32,7 @@ class BookmarkComponentTest {
TestUtils.setRxSchedulers()
bookmarkComponent = spyk(
BookmarkComponentTest.TestBookmarkComponent(mockk(), TestUtils.bus),
TestBookmarkComponent(mockk(), TestUtils.bus),
recordPrivateCalls = true
)
bookmarkObserver = bookmarkComponent.internalRender(bookmarkComponent.reducer).test()
@ -62,6 +62,29 @@ class BookmarkComponentTest {
)
}
@Test
fun `select and delete a bookmark`() {
val itemToSelect = BookmarkNode(BookmarkNodeType.ITEM, "234", "123", 0, "Mozilla", "http://mozilla.org", null)
val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "345", "123", 1, null, null, null)
val innerFolder = BookmarkNode(BookmarkNodeType.FOLDER, "456", "123", 2, "Web Browsers", null, null)
val tree = BookmarkNode(
BookmarkNodeType.FOLDER, "123", BookmarkRoot.Mobile.id, 0, "Best Sites", null,
listOf(itemToSelect, separator, innerFolder)
)
emitter.onNext(BookmarkChange.Change(tree))
emitter.onNext(BookmarkChange.IsSelected(itemToSelect))
emitter.onNext(BookmarkChange.Change(tree - itemToSelect.guid))
bookmarkObserver.assertSubscribed().awaitCount(2).assertNoErrors()
.assertValues(
BookmarkState(null, BookmarkState.Mode.Normal),
BookmarkState(tree, BookmarkState.Mode.Normal),
BookmarkState(tree, BookmarkState.Mode.Selecting(setOf(itemToSelect))),
BookmarkState(tree - itemToSelect.guid, BookmarkState.Mode.Normal)
)
}
@Suppress("MemberVisibilityCanBePrivate")
class TestBookmarkComponent(container: ViewGroup, bus: ActionBusFactory) :
BookmarkComponent(container, bus) {