Skip to content

Commit 3fc041e

Browse files
nbradburyclaude
andcommitted
Fix SubFilterViewModelTest mock and posttypes manifest merger conflict
Revert savedTag mock to use property access (no-arg getLabel) matching production code, and remove allowBackup/usesCleartextTraffic from posttypes library manifest to fix manifest merger conflict. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 4d32154 commit 3fc041e

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

WordPress/src/test/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class SubFilterViewModelTest : BaseUnitTest() {
9191

9292
@Before
9393
fun setUp() {
94-
whenever(savedTag.getLabel(anyOrNull())).thenReturn("tag-label")
94+
whenever(savedTag.label).thenReturn("tag-label")
9595

9696
viewModel = SubFilterViewModel(
9797
testDispatcher(),

libs/posttypes/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
77
xmlns:tools="http://schemas.android.com/tools">
88
<application
9-
android:allowBackup="false"
10-
android:usesCleartextTraffic="false"
119
tools:ignore="UnusedAttribute">
1210
<activity
1311
android:name="org.wordpress.android.posttypes.CptPostTypesActivity"

0 commit comments

Comments
 (0)