blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Update testing dependencies

master
Emily Kager 2019-08-08 11:08:53 -07:00 committed by Emily Kager
parent 73c3b43429
commit e1f0c9f48b
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -411,7 +411,9 @@ dependencies {
}
testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
implementation Deps.fragment_testing
implementation Deps.fragment_testing, {
exclude group: 'androidx.test', module: 'core'
}
// For production builds, the native code for all `org.mozilla.appservices`
// dependencies gets compiled together into a single "megazord" build, and
// different megazords are published for different subsets of features. Ref

4
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
View File

@ -13,6 +13,8 @@ import io.mockk.every
import io.mockk.just
import io.mockk.mockk
import io.mockk.verify
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.ObsoleteCoroutinesApi
import mozilla.components.browser.session.Session
import mozilla.components.browser.session.SessionManager
import mozilla.components.concept.engine.EngineView
@ -36,6 +38,8 @@ import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.home.sessioncontrol.Tab
import org.mozilla.fenix.home.sessioncontrol.TabCollection
@ExperimentalCoroutinesApi
@ObsoleteCoroutinesApi
class DefaultBrowserToolbarControllerTest {
private var context: HomeActivity = mockk(relaxed = true)

10
buildSrc/src/main/java/Dependencies.kt
View File

@ -58,9 +58,9 @@ object Versions {
const val espresso_core = "2.2.2"
const val espresso_version = "3.0.2"
const val mockwebserver = "3.11.0"
const val orchestrator = "1.1.1"
const val tools_test_rules = "1.1.1"
const val tools_test_runner = "1.1.1"
const val orchestrator = "1.3.0-alpha02"
const val tools_test_rules = "1.3.0-alpha02"
const val tools_test_runner = "1.3.0-alpha02"
const val uiautomator = "2.1.3"
const val robolectric = "4.2"
@ -201,8 +201,8 @@ object Deps {
const val espresso_idling_resources = "com.android.support.test.espresso:espresso-idling-resource:${Versions.espresso_version}"
const val mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockwebserver}"
const val orchestrator = "androidx.test:orchestrator:${Versions.orchestrator}"
const val tools_test_rules = "com.android.support.test:rules:${Versions.tools_test_rules}"
const val tools_test_runner = "com.android.support.test:runner:${Versions.tools_test_runner}"
const val tools_test_rules = "androidx.test:rules:${Versions.tools_test_rules}"
const val tools_test_runner = "androidx.test:runner:${Versions.tools_test_runner}"
const val uiautomator = "com.android.support.test.uiautomator:uiautomator-v18:${Versions.uiautomator}"
const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
const val fragment_testing = "androidx.fragment:fragment-testing:${Versions.androidx_fragment}"