From b14fbf8aa0be67745860c7e59d7d9743ba5d990e Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 9 Sep 2024 15:48:02 -0400 Subject: [PATCH 1/3] Updates FluxC version to include https://github.com/wordpress-mobile/WordPress-FluxC-Android/pull/3090 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5d088b8b0eb6..95725cc81a5e 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ ext { automatticTracksVersion = '5.1.0' gutenbergMobileVersion = 'v1.121.0' wordPressAztecVersion = 'v2.1.4' - wordPressFluxCVersion = 'trunk-94d25d35fb4bf58a2e90741a6a5d56b8c6c3ce42' + wordPressFluxCVersion = 'trunk-a77c116b8bd00247c8c0551b4497629ff84ca023' wordPressLoginVersion = '1.16.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressRsVersion = 'trunk-50f703a7f677084157d02f05d4d477d7eaf960b1' From 4da1d5c5e2307e8c47ce473a76396b52ed0e82f6 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 9 Sep 2024 15:53:10 -0400 Subject: [PATCH 2/3] Fixed failing tests due to missing param --- .../campaignlisting/CampaignListingUIModelMapperTest.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt index 50abe4e137ee..8faaa637d181 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapperTest.kt @@ -4,9 +4,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test -import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.junit.MockitoJUnitRunner import org.mockito.kotlin.mock import org.mockito.kotlin.whenever import org.wordpress.android.BaseUnitTest @@ -17,7 +15,6 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsUtils import org.wordpress.android.ui.utils.UiString @ExperimentalCoroutinesApi -@RunWith(MockitoJUnitRunner::class) class CampaignListingUIModelMapperTest : BaseUnitTest() { @Mock lateinit var statsUtils: StatsUtils @@ -41,6 +38,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() { targetUrn = null, totalBudget = 1.0, spentBudget = 0.0, + isEndlessCampaign = false, ) @Test @@ -71,6 +69,7 @@ class CampaignListingUIModelMapperTest : BaseUnitTest() { targetUrn = null, totalBudget = 0.0, spentBudget = 0.0, + isEndlessCampaign = false, ) @Test From 26755f3c99d1231dce2e2b040b26ec5ecb569226 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Mon, 9 Sep 2024 19:24:08 -0400 Subject: [PATCH 3/3] Fixed failing tests due to missing param --- .../ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt index 9d13daeb6516..37acf175bcdf 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/blaze/BlazeCardBuilderTest.kt @@ -35,6 +35,7 @@ val campaign = BlazeCampaignModel( targetUrn = null, totalBudget = 0.0, spentBudget = 0.0, + isEndlessCampaign = false, ) val onCreateCampaignClick = { }