Skip to content

Commit f6cb3d9

Browse files
committed
Merge branch 'release/5.49.0'
2 parents 9cc81c1 + e9e8b8c commit f6cb3d9

File tree

122 files changed

+2203
-3625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+2203
-3625
lines changed

app/schemas/com.duckduckgo.app.global.db.AppDatabase/18.json

Lines changed: 668 additions & 0 deletions
Large diffs are not rendered by default.

app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ import com.duckduckgo.app.global.DispatcherProvider
2020
import kotlinx.coroutines.CoroutineDispatcher
2121
import kotlinx.coroutines.Dispatchers
2222
import kotlinx.coroutines.ExperimentalCoroutinesApi
23-
import kotlinx.coroutines.test.TestCoroutineDispatcher
24-
import kotlinx.coroutines.test.resetMain
25-
import kotlinx.coroutines.test.setMain
23+
import kotlinx.coroutines.test.*
2624
import org.junit.rules.TestWatcher
2725
import org.junit.runner.Description
2826

@@ -47,4 +45,9 @@ class CoroutineTestRule(val testDispatcher: TestCoroutineDispatcher = TestCorout
4745
Dispatchers.resetMain()
4846
testDispatcher.cleanupTestCoroutines()
4947
}
48+
}
49+
50+
@ExperimentalCoroutinesApi
51+
fun CoroutineTestRule.runBlocking(block: suspend () -> Unit) = this.testDispatcher.runBlockingTest {
52+
block()
5053
}

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

Lines changed: 83 additions & 232 deletions
Large diffs are not rendered by default.

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelNextCtaTest.kt

Lines changed: 0 additions & 256 deletions
This file was deleted.

0 commit comments

Comments
 (0)