Introduce DaxCta interface (duckduckgo#680)

marcosholgado · web-flow · commit 5603bad3e510 · 2020-02-04T12:45:56.000Z
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -1445,20 +1445,11 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenRegisterDaxBubbleCtaShownThenFirePixel() {
+    fun whenRegisterDaxBubbleCtaDismissedThenRegisterInDatabase() {
         val cta = DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore)
         testee.ctaViewState.value = BrowserTabViewModel.CtaViewState(cta = cta)
 
-        testee.registerDaxBubbleCtaShown()
-        verify(mockPixel).fire(cta.shownPixel!!, cta.pixelShownParameters())
-    }
-
-    @Test
-    fun whenRegisterDaxBubbleCtaShownThenRegisterInDatabase() {
-        val cta = DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore)
-        testee.ctaViewState.value = BrowserTabViewModel.CtaViewState(cta = cta)
-
-        testee.registerDaxBubbleCtaShown()
+        testee.registerDaxBubbleCtaDismissed()
         verify(mockDismissedCtaDao).insert(DismissedCta(cta.ctaId))
     }
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt
@@ -30,7 +30,6 @@ import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
-import org.mockito.Mockito.mock
 import org.mockito.MockitoAnnotations
 import java.util.concurrent.TimeUnit
 
@@ -146,6 +145,49 @@ class CtaTest {
         assertEquals(expectedValue, value[CTA_SHOWN])
     }
 
+    @Test
+    fun whenAddCtaToHistoryThenReturnCorrectValue() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn(null)
+        whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis())
+
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        val value = testee.addCtaToHistory("test")
+        assertEquals("test:0", value)
+    }
+
+    @Test
+    fun whenAddCtaToHistoryOnDay3ThenReturnCorrectValue() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn(null)
+        whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(3))
+
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        val value = testee.addCtaToHistory("test")
+        assertEquals("test:3", value)
+    }
+
+    @Test
+    fun whenAddCtaToHistoryOnDay4ThenReturn3AsDayValue() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn(null)
+        whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(4))
+
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        val value = testee.addCtaToHistory("test")
+        assertEquals("test:3", value)
+    }
+
+    @Test
+    fun whenAddCtaToHistoryContainsHistoryThenConcatenateNewValue() {
+        val ctaHistory = "s:0-t:1"
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn(ctaHistory)
+        whenever(mockAppInstallStore.installTimestamp).thenReturn(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
+
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        val value = testee.addCtaToHistory("test")
+        val expectedValue = "$ctaHistory-test:1"
+
+        assertEquals(expectedValue, value)
+    }
+
     @Test
     fun whenCtaIsBubbleTypeThenConcatenateJourneyStoredValueInPixel() {
         val existingJourney = "s:0-t:1"
@@ -158,6 +200,21 @@ class CtaTest {
         assertEquals(expectedValue, value[CTA_SHOWN])
     }
 
+    @Test
+    fun whenCanSendPixelAndCtaNotPartOfHistoryThenReturnTrue() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn("s:0")
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        assertTrue(testee.canSendShownPixel())
+    }
+
+    @Test
+    fun whenCanSendPixelAndCtaIsPartOfHistoryThenReturnFalse() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn("e:0")
+
+        val testee = DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore)
+        assertFalse(testee.canSendShownPixel())
+    }
+
     @Test
     fun whenCtaIsDialogTypeReturnCorrectCancelParameters() {
         val testee = DaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore)
@@ -218,7 +275,7 @@ class CtaTest {
     }
 
     @Test
-    fun whenTwoMajorTrackersBlockedReturnThemWithMultipleString() {
+    fun whenTwoMajorTrackersBlockedReturnThemWithZeroString() {
         val trackers = listOf(
             TrackingEvent("facebook.com", "facebook.com", blocked = true, entity = TestEntity("Facebook", "Facebook", 9.0), categories = null),
             TrackingEvent("other.com", "other.com", blocked = true, entity = TestEntity("Other", "Other", 9.0), categories = null)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt
@@ -149,7 +149,20 @@ class CtaViewModelTest {
     }
 
     @Test
-    fun whenCtaShownPixelIsFired() {
+    fun whenCtaShownAndCtaIsDaxAndCanNotSendPixelThenPixelIsNotFired() {
+        testee.onCtaShown(DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore))
+        verify(mockPixel, never()).fire(eq(SURVEY_CTA_SHOWN), any())
+    }
+
+    @Test
+    fun whenCtaShownAndCtaIsDaxAndCanSendPixelThenPixelIsFired() {
+        whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn("s:0")
+        testee.onCtaShown(DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore))
+        verify(mockPixel, never()).fire(eq(SURVEY_CTA_SHOWN), any())
+    }
+
+    @Test
+    fun whenCtaShownAndCtaIsNotDaxThenPixelIsFired() {
         testee.onCtaShown(HomePanelCta.Survey(Survey("abc", "http://example.com", 1, SCHEDULED)))
         verify(mockPixel).fire(eq(SURVEY_CTA_SHOWN), any())
     }
@@ -193,28 +206,16 @@ class CtaViewModelTest {
 
     @Test
     fun whenRegisterDaxBubbleIntroCtaThenDatabaseNotified() {
-        testee.registerDaxBubbleCtaShown(DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore))
+        testee.registerDaxBubbleCtaDismissed(DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore))
         verify(mockDismissedCtaDao).insert(DismissedCta(CtaId.DAX_INTRO))
     }
 
-    @Test
-    fun whenRegisterDaxBubbleIntroCtaThenPixelIsFired() {
-        testee.registerDaxBubbleCtaShown(DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore))
-        verify(mockPixel).fire(eq(ONBOARDING_DAX_CTA_SHOWN), any())
-    }
-
     @Test
     fun whenRegisterDaxBubbleEndCtaThenDatabaseNotified() {
-        testee.registerDaxBubbleCtaShown(DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore))
+        testee.registerDaxBubbleCtaDismissed(DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore))
         verify(mockDismissedCtaDao).insert(DismissedCta(CtaId.DAX_END))
     }
 
-    @Test
-    fun whenRegisterDaxBubbleEndCtaThenPixelIsFired() {
-        testee.registerDaxBubbleCtaShown(DaxBubbleCta.DaxIntroCta(mockOnboardingStore, mockAppInstallStore))
-        verify(mockPixel).fire(eq(ONBOARDING_DAX_CTA_SHOWN), any())
-    }
-
     @Test
     fun whenRefreshCtaOnHomeTabAndConceptTestFeatureActiveThenReturnDaxIntroCta() = runBlockingTest {
         setConceptTestFeature()
diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt b/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt
@@ -77,7 +77,7 @@ interface TestAppComponent : AppComponent {
     interface Builder {
 
         @BindsInstance
-        fun application(application: Application): TestAppComponent.Builder
+        fun application(application: Application): Builder
 
         fun build(): TestAppComponent
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -432,7 +432,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
     private fun navigate(url: String) {
         hideKeyboard()
         renderer.hideFindInPage()
-        viewModel.registerDaxBubbleCtaShown()
+        viewModel.registerDaxBubbleCtaDismissed()
         webView?.loadUrl(url)
     }
 
@@ -1364,9 +1364,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
                 is DaxDialogCta -> showDaxDialogCta(configuration)
             }
 
-            if (configuration !is DaxBubbleCta) {
-                viewModel.onCtaShown()
-            }
+            viewModel.onCtaShown()
         }
 
         private fun showDaxDialogCta(configuration: DaxDialogCta) {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -887,9 +887,9 @@ class BrowserTabViewModel(
         }
     }
 
-    fun registerDaxBubbleCtaShown() {
+    fun registerDaxBubbleCtaDismissed() {
         val cta = ctaViewState.value?.cta ?: return
-        ctaViewModel.registerDaxBubbleCtaShown(cta)
+        ctaViewModel.registerDaxBubbleCtaDismissed(cta)
     }
 
     fun onUserClickCtaOkButton() {
diff --git a/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt b/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt
diff --git a/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt b/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ interface TestAppComponent : AppComponent {`
`77`	`77`	`interface Builder {`
`78`	`78`
`79`	`79`	`@BindsInstance`
`80`		`- fun application(application: Application): TestAppComponent.Builder`
	`80`	`+ fun application(application: Application): Builder`
`81`	`81`
`82`	`82`	`fun build(): TestAppComponent`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {`
`432`	`432`	`private fun navigate(url: String) {`
`433`	`433`	`hideKeyboard()`
`434`	`434`	`renderer.hideFindInPage()`
`435`		`- viewModel.registerDaxBubbleCtaShown()`
	`435`	`+ viewModel.registerDaxBubbleCtaDismissed()`
`436`	`436`	`webView?.loadUrl(url)`
`437`	`437`	`}`
`438`	`438`
`@@ -1364,9 +1364,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {`
`1364`	`1364`	`is DaxDialogCta -> showDaxDialogCta(configuration)`
`1365`	`1365`	`}`
`1366`	`1366`
`1367`		`- if (configuration !is DaxBubbleCta) {`
`1368`		`- viewModel.onCtaShown()`
`1369`		`- }`
	`1367`	`+ viewModel.onCtaShown()`
`1370`	`1368`	`}`
`1371`	`1369`
`1372`	`1370`	`private fun showDaxDialogCta(configuration: DaxDialogCta) {`
Original file line number	Diff line number	Diff line change
`@@ -887,9 +887,9 @@ class BrowserTabViewModel(`
`887`	`887`	`}`
`888`	`888`	`}`
`889`	`889`
`890`		`- fun registerDaxBubbleCtaShown() {`
	`890`	`+ fun registerDaxBubbleCtaDismissed() {`
`891`	`891`	`val cta = ctaViewState.value?.cta ?: return`
`892`		`- ctaViewModel.registerDaxBubbleCtaShown(cta)`
	`892`	`+ ctaViewModel.registerDaxBubbleCtaDismissed(cta)`
`893`	`893`	`}`
`894`	`894`
`895`	`895`	`fun onUserClickCtaOkButton() {`