ishan/fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Closes #4513: fixes bookmark tests broken by loading change

Browse Source 
Note that BookmarkFragmentStoreTest changes preserve existing behavior, which in many cases is more expansive than the test name implies
This commit is contained in:
Severin Rudie 2019-09-25 09:30:21 -07:00 committed by Emily Kager
parent fd7f1b2665
commit dffa61bf16
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt
View File

@ -33,6 +33,7 @@ class BookmarkDeselectNavigationListener(
*/
override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
if (destination.id != R.id.bookmarkFragment || differentFromSelectedFolder(arguments)) {
// TODO this is currently called when opening the bookmark menu. Fix this if possible
bookmarkInteractor.onAllBookmarksDeselected()
}
}

17
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt
View File

@ -25,7 +25,8 @@ class BookmarkFragmentStoreTest {
store.dispatch(BookmarkFragmentAction.Change(tree)).join()
assertThat(initialState.copy(tree = tree)).isEqualTo(store.state)
assertThat(tree).isEqualTo(store.state.tree)
assertThat(initialState.mode).isEqualTo(store.state.mode)
}
@Test
@ -37,7 +38,8 @@ class BookmarkFragmentStoreTest {
store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
assertThat(initialState.copy(tree = newTree)).isEqualTo(store.state)
assertThat(newTree).isEqualTo(store.state.tree)
assertThat(initialState.mode).isEqualTo(store.state.mode)
}
@Test
@ -49,7 +51,8 @@ class BookmarkFragmentStoreTest {
store.dispatch(BookmarkFragmentAction.Change(tree)).join()
assertSame(initialState, store.state)
assertThat(initialState.tree).isEqualTo(store.state.tree)
assertThat(initialState.mode).isEqualTo(store.state.mode)
}
@Test
@ -59,7 +62,8 @@ class BookmarkFragmentStoreTest {
store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
assertThat(BookmarkFragmentState(newTree, BookmarkFragmentState.Mode.Selecting(setOf(subfolder)))).isEqualTo(store.state)
assertThat(newTree).isEqualTo(store.state.tree)
assertThat(BookmarkFragmentState.Mode.Selecting(setOf(subfolder))).isEqualTo(store.state.mode)
}
@Test
@ -133,7 +137,10 @@ class BookmarkFragmentStoreTest {
store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
assertThat(initialState.copy(tree = newTree, mode = BookmarkFragmentState.Mode.Normal)).isEqualTo(store.state)
store.state.run {
assertThat(newTree).isEqualTo(tree)
assertThat(BookmarkFragmentState.Mode.Normal).isEqualTo(mode)
}
}
@Test