Skip to content

trim user input on submission #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2018
Merged

trim user input on submission #137

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
21 changes: 15 additions & 6 deletions app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.arch.persistence.room.Room
import android.net.Uri
import android.support.test.InstrumentationRegistry
import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
import com.duckduckgo.app.blockingObserve
import com.duckduckgo.app.bookmarks.db.BookmarkEntity
import com.duckduckgo.app.bookmarks.db.BookmarksDao
import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
Expand All @@ -45,7 +46,9 @@ import com.duckduckgo.app.settings.db.SettingsDataStore
import com.duckduckgo.app.trackerdetection.model.TrackerNetwork
import com.duckduckgo.app.trackerdetection.model.TrackerNetworks
import com.duckduckgo.app.trackerdetection.model.TrackingEvent
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.whenever
import org.junit.After
import org.junit.Assert.*
Expand Down Expand Up @@ -100,11 +103,7 @@ class BrowserViewModelTest {
private lateinit var db: AppDatabase
private lateinit var appConfigurationDao: AppConfigurationDao

private val testOmnibarConverter: OmnibarEntryConverter = object : OmnibarEntryConverter {
override fun convertUri(input: String): String = "duckduckgo.com"
override fun isWebUrl(inputQuery: String): Boolean = true
override fun convertQueryToUri(inputQuery: String): Uri = Uri.parse("duckduckgo.com")
}
private val mockOmnibarConverter: OmnibarEntryConverter = mock()

private lateinit var testee: BrowserViewModel

Expand All @@ -118,7 +117,7 @@ class BrowserViewModelTest {
appConfigurationDao = db.appConfigurationDao()

testee = BrowserViewModel(
queryUrlConverter = testOmnibarConverter,
queryUrlConverter = mockOmnibarConverter,
duckDuckGoUrlDetector = DuckDuckGoUrlDetector(),
termsOfServiceStore = mockTermsOfServiceStore,
trackerNetworks = TrackerNetworks(),
Expand All @@ -132,6 +131,9 @@ class BrowserViewModelTest {

testee.url.observeForever(mockQueryObserver)
testee.command.observeForever(mockNavigationObserver)

whenever(mockOmnibarConverter.convertQueryToUri(any())).thenReturn(Uri.parse("duckduckgo.com"))

}

@After
Expand All @@ -142,6 +144,13 @@ class BrowserViewModelTest {
testee.command.removeObserver(mockNavigationObserver)
}

@Test
fun whenSubmittedQueryHasWhitespaceItIsTrimmed() {
testee.onUserSubmittedQuery(" nytimes.com ")
verify(mockOmnibarConverter).isWebUrl("nytimes.com")
assertEquals("nytimes.com", testee.viewState.value!!.omnibarText)
}

@Test
fun whenBookmarksResultCodeIsOpenUrlThenNavigate() {
testee.receivedBookmarksResult(BookmarksActivity.OPEN_URL_RESULT_CODE, "www.example.com")
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,11 @@ class BrowserViewModel(
if (input.isBlank()) {
return
}
url.value = buildUrl(input)
val trimmedInput = input.trim()
url.value = buildUrl(trimmedInput)
viewState.value = currentViewState().copy(
showClearButton = false,
omnibarText = input,
omnibarText = trimmedInput,
showAutoCompleteSuggestions = false,
autoCompleteSearchResults = AutoCompleteResult("", emptyList()))
}
Expand Down