Bug 1861173 - Correctly increment shopping CFR counter

Using `.inc()` was wrong due to it returning the incremented
value and not incrementing the already existing one. This
patch aims to fix that, therefore showing the CFR correctly
for max 3 times.

(cherry picked from commit 67b68c948b76ea86294c91d520ee0b58d3b31fdf)
fenix/120.0
DreVla 7 months ago committed by mergify[bot]
parent 01d9386987
commit e528b96bc6

@ -237,7 +237,7 @@ class DefaultBrowserToolbarController(
* As described in: https://bugzilla.mozilla.org/show_bug.cgi?id=1861173#c0 * As described in: https://bugzilla.mozilla.org/show_bug.cgi?id=1861173#c0
*/ */
private fun updateShoppingCfrSettings() = with(activity.settings()) { private fun updateShoppingCfrSettings() = with(activity.settings()) {
reviewQualityCheckCFRClosedCounter.inc() reviewQualityCheckCFRClosedCounter++
if (reviewQualityCheckCfrDisplayTimeInMillis != 0L && if (reviewQualityCheckCfrDisplayTimeInMillis != 0L &&
reviewQualityCheckCFRClosedCounter >= MAX_DISPLAY_NUMBER_SHOPPING_CFR reviewQualityCheckCFRClosedCounter >= MAX_DISPLAY_NUMBER_SHOPPING_CFR
) { ) {

@ -396,12 +396,13 @@ class DefaultBrowserToolbarControllerTest {
} }
@Test @Test
fun handleShoppingCfrDismissOnce() { fun handleShoppingCfrDismiss() {
val controller = createController() val controller = createController()
val mockSettings = mockk<Settings> { val mockSettings = mockk<Settings> {
every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis() every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis()
every { reviewQualityCheckCfrDisplayTimeInMillis = any() } just Runs every { reviewQualityCheckCfrDisplayTimeInMillis = any() } just Runs
every { reviewQualityCheckCFRClosedCounter } returns 1 every { reviewQualityCheckCFRClosedCounter } returns 1
every { reviewQualityCheckCFRClosedCounter = 2 } just Runs
every { shouldShowReviewQualityCheckCFR } returns true every { shouldShowReviewQualityCheckCFR } returns true
} }
every { activity.settings() } returns mockSettings every { activity.settings() } returns mockSettings
@ -419,6 +420,7 @@ class DefaultBrowserToolbarControllerTest {
every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis() every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis()
every { reviewQualityCheckCfrDisplayTimeInMillis = any() } just Runs every { reviewQualityCheckCfrDisplayTimeInMillis = any() } just Runs
every { reviewQualityCheckCFRClosedCounter } returns 2 every { reviewQualityCheckCFRClosedCounter } returns 2
every { reviewQualityCheckCFRClosedCounter = 3 } just Runs
every { shouldShowReviewQualityCheckCFR } returns true every { shouldShowReviewQualityCheckCFR } returns true
} }
every { activity.settings() } returns mockSettings every { activity.settings() } returns mockSettings
@ -435,6 +437,7 @@ class DefaultBrowserToolbarControllerTest {
val mockSettings = mockk<Settings> { val mockSettings = mockk<Settings> {
every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis() every { reviewQualityCheckCfrDisplayTimeInMillis } returns System.currentTimeMillis()
every { reviewQualityCheckCFRClosedCounter } returns 3 every { reviewQualityCheckCFRClosedCounter } returns 3
every { reviewQualityCheckCFRClosedCounter = 4 } just Runs
every { shouldShowReviewQualityCheckCFR } returns true every { shouldShowReviewQualityCheckCFR } returns true
every { shouldShowReviewQualityCheckCFR = any() } just Runs every { shouldShowReviewQualityCheckCFR = any() } just Runs
} }

Loading…
Cancel
Save