Merge branch 'release/5.254.0'

Author: github-actions[bot]

.github/workflows/design-system-composable-pr-test.yml

@@ -0,0 +1,80 @@
+name: Design System Composable PR Tests
+
+on:
+  pull_request:
+    paths:
+      - 'design-system/src/main/java/com/duckduckgo/common/ui/compose/**/*.kt'
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  maestro_test:
+    runs-on: ubuntu-latest
+    name: Run Design System Maestro Tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up JDK version
+        uses: actions/setup-java@v4
+        with:
+          java-version-file: .github/.java-version
+          distribution: 'adopt'
+
+      - name: Create folder
+        run: mkdir apk
+
+      - name: Decode keys
+        uses: davidSchuppa/base64Secret-toFile-action@v2
+        with:
+          secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }}
+          fileName: ddg_android_build.properties
+          destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
+
+      - name: Decode key file
+        uses: davidSchuppa/base64Secret-toFile-action@v2
+        with:
+          secret: ${{ secrets.FAKE_RELEASE_KEY }}
+          fileName: android
+          destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Assemble internal release APK
+        run: ./gradlew assembleInternalRelease -Pforce-default-variant -Pskip-onboarding
+
+      - name: Move APK to new folder
+        if: always()
+        run: find . -name "*internal-release*.apk" -exec mv '{}' apk/internal.apk \;
+
+      - name: Run Design System Maestro Tests
+        uses: mobile-dev-inc/[email protected]
+        timeout-minutes: 30
+        with:
+          api-key: ${{ secrets.ROBIN_API_KEY }}
+          project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
+          name: design_system_pr_${{ github.event.pull_request.number }}_${{ github.sha }}
+          timeout: 15
+          app-file: apk/internal.apk
+          android-api-level: 30
+          workspace: .maestro
+          include-tags: androidDesignSystemTest
+
+      - name: Comment on PR
+        if: failure()
+        uses: actions/github-script@v8
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: "❌ Design System Maestro tests failed. Please check the [workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details."
+            })

.maestro/ads_preview_flows/1-_design-system-components.yaml

@@ -24,6 +24,8 @@ tags:
         - assertVisible: "COLOR PALETTE"
         - tapOn: "TYPOGRAPHY"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "Text Appearance Caption"
             direction: DOWN
@@ -37,13 +39,17 @@ tags:
         - assertVisible: "Keep Using"
         - tapOn: "Keep Using"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "Stacked Text Alert Dialog With 4 buttons"
             direction: DOWN
         - tapOn: "Stacked Text Alert Dialog With 4 buttons"
         - assertVisible: "Keep Using"
         - tapOn: "Keep Using"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "Promo Bottom Sheet with image"
             direction: DOWN
@@ -60,6 +66,8 @@ tags:
         - tapOn:
             id: "com.duckduckgo.mobile.android:id/bottomSheetPromoPrimaryButton"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "Cookie Consent dialog with animation"
             direction: DOWN
@@ -72,7 +80,7 @@ tags:
         - tapOn:
             id: "com.duckduckgo.mobile.android:id/primaryCta"
         - tapOn: "LAYOUTS"
-        - assertVisible: "Expandable Layout"
+        - assertVisible: "Dax Dialog Card"
         - tapOn: "INTERACTIVE"
         - tapOn:
             id: "com.duckduckgo.mobile.android:id/dax_switch_one"
@@ -100,11 +108,15 @@ tags:
             index: 0
         - tapOn: "LIST ITEMS"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "With Beta Pill and Switch"
             direction: DOWN
         - tapOn: "Others"
         - scrollUntilVisible:
+            timeout: 50000
+            speed: 60
             element:
               text: "Enable Dark Theme"
             direction: UP

app/build.gradle

@@ -374,6 +374,7 @@ dependencies {
     implementation project(':saved-sites-api')
     implementation project(':saved-sites-impl')
     implementation project(':saved-sites-store')
+    internalImplementation project(':saved-sites-internal')
 
     implementation project(':runtime-checks-impl')
     implementation project(':runtime-checks-store')

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

@@ -193,6 +193,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Unique
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelValues.DAX_INITIAL_CTA
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelValues.DAX_SERP_CTA
 import com.duckduckgo.app.surrogates.SurrogateResponse
+import com.duckduckgo.app.systemsearch.DeviceAppLookup
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.tabs.store.TabStatsBucketing
@@ -203,6 +204,8 @@ import com.duckduckgo.app.trackerdetection.model.TrackingEvent
 import com.duckduckgo.app.usage.search.SearchCountDao
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
+import com.duckduckgo.autoconsent.impl.pixels.AutoConsentPixel
+import com.duckduckgo.autoconsent.impl.pixels.AutoconsentPixelManager
 import com.duckduckgo.autofill.api.AutofillCapabilityChecker
 import com.duckduckgo.autofill.api.domain.app.LoginCredentials
 import com.duckduckgo.autofill.api.email.EmailManager
@@ -293,7 +296,6 @@ import com.duckduckgo.site.permissions.api.SitePermissionsManager.LocationPermis
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissionQueryResponse
 import com.duckduckgo.site.permissions.api.SitePermissionsManager.SitePermissions
 import com.duckduckgo.subscriptions.api.SUBSCRIPTIONS_FEATURE_NAME
-import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import com.duckduckgo.subscriptions.api.Subscriptions
 import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
 import com.duckduckgo.sync.api.favicons.FaviconsFetchingPrompt
@@ -400,6 +402,8 @@ class BrowserTabViewModelTest {
 
     private val mockHttpErrorPixels: HttpErrorPixels = mock()
 
+    private val mockAutoconsentPixelManager: AutoconsentPixelManager = mock()
+
     private val mockOnboardingStore: OnboardingStore = mock()
 
     private val mockAutoCompleteService: AutoCompleteService = mock()
@@ -580,7 +584,6 @@ class BrowserTabViewModelTest {
     private val mockSiteHttpErrorHandler: HttpCodeSiteErrorHandler = mock()
     private val mockSubscriptionsJSHelper: SubscriptionsJSHelper = mock()
     private val mockOnboardingHomeScreenWidgetToggles: OnboardingHomeScreenWidgetToggles = mock()
-    private val mockRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle = mock()
     private val tabManager: TabManager = mock()
 
     private val mockAddressDisplayFormatter: AddressDisplayFormatter by lazy {
@@ -618,6 +621,8 @@ class BrowserTabViewModelTest {
     private val fakeMessagingPlugins = FakeWebMessagingPluginPoint()
     private val fakePostMessageWrapperPlugins = FakePostMessageWrapperPluginPoint()
 
+    private val mockDeviceAppLookup: DeviceAppLookup = mock()
+
     @Before
     fun before() =
         runTest {
@@ -648,6 +653,9 @@ class BrowserTabViewModelTest {
                     mockHistory,
                     DefaultDispatcherProvider(),
                     mockPixel,
+                    mockDeviceAppLookup,
+                    coroutineRule.testScope,
+                    AutoComplete.Config(),
                 )
             val fireproofWebsiteRepositoryImpl =
                 FireproofWebsiteRepositoryImpl(
@@ -713,7 +721,6 @@ class BrowserTabViewModelTest {
                     brokenSitePrompt = mockBrokenSitePrompt,
                     onboardingHomeScreenWidgetToggles = mockOnboardingHomeScreenWidgetToggles,
                     onboardingDesignExperimentManager = mockOnboardingDesignExperimentManager,
-                    rebrandingFeatureToggle = mockRebrandingFeatureToggle,
                 )
 
             val siteFactory =
@@ -847,6 +854,7 @@ class BrowserTabViewModelTest {
                     webMessagingPlugins = fakeMessagingPlugins,
                     postMessageWrapperPlugins = fakePostMessageWrapperPlugins,
                     addressBarTrackersAnimationFeatureToggle = mockAddressBarTrackersAnimationFeatureToggle,
+                    autoconsentPixelManager = mockAutoconsentPixelManager,
                 )
 
             testee.loadData("abc", null, false, false)
@@ -6498,6 +6506,48 @@ class BrowserTabViewModelTest {
         assertCommandIssued<ShowAutoconsentAnimation>()
     }
 
+    @Test
+    fun whenAutoConsentPopupHandledAndCosmeticTrueThenFireAnimationShownCosmeticPixel() {
+        testee.browserViewState.value =
+            testee.browserViewState.value?.copy(
+                browserShowing = true,
+                maliciousSiteBlocked = false,
+                maliciousSiteStatus = null,
+            )
+
+        testee.onAutoConsentPopUpHandled(true)
+
+        verify(mockAutoconsentPixelManager).fireDailyPixel(AutoConsentPixel.AUTOCONSENT_ANIMATION_SHOWN_COSMETIC_DAILY)
+    }
+
+    @Test
+    fun whenAutoConsentPopupHandledAndCosmeticFalseThenFireAnimationShownPixel() {
+        testee.browserViewState.value =
+            testee.browserViewState.value?.copy(
+                browserShowing = true,
+                maliciousSiteBlocked = false,
+                maliciousSiteStatus = null,
+            )
+
+        testee.onAutoConsentPopUpHandled(false)
+
+        verify(mockAutoconsentPixelManager).fireDailyPixel(AutoConsentPixel.AUTOCONSENT_ANIMATION_SHOWN_DAILY)
+    }
+
+    @Test
+    fun whenAutoConsentPopupHandledAndMaliciousSiteBlockedThenNoPixelFired() {
+        testee.browserViewState.value =
+            testee.browserViewState.value?.copy(
+                browserShowing = true,
+                maliciousSiteBlocked = true,
+                maliciousSiteStatus = PHISHING,
+            )
+
+        testee.onAutoConsentPopUpHandled(true)
+
+        verify(mockAutoconsentPixelManager, never()).fireDailyPixel(any())
+    }
+
     @Test
     fun whenVisitSiteThenUpdateLoadingViewStateAndOmnibarViewState() {
         testee.browserViewState.value =
@@ -7159,6 +7209,28 @@ class BrowserTabViewModelTest {
             verify(mockOnboardingDesignExperimentManager).fireFireButtonClickedFromOnboardingPixel()
         }
 
+    @Test
+    fun whenFireMenuSelectedAndFireButtonHighlightedThenHighlightIsCleared() = runTest {
+        testee.browserViewState.value = browserViewState().copy(fireButton = HighlightableButton.Visible(highlighted = true))
+
+        testee.onFireMenuSelected()
+
+        val viewState = testee.browserViewState.value
+        assertNotNull(viewState)
+        assertFalse((viewState.fireButton as HighlightableButton.Visible).highlighted)
+    }
+
+    @Test
+    fun whenFireMenuSelectedAndFireButtonNotHighlightedThenStateUnchanged() = runTest {
+        testee.browserViewState.value = browserViewState().copy(fireButton = HighlightableButton.Visible(highlighted = false))
+
+        testee.onFireMenuSelected()
+
+        val viewState = testee.browserViewState.value
+        assertNotNull(viewState)
+        assertFalse((viewState.fireButton as HighlightableButton.Visible).highlighted)
+    }
+
     @Test
     fun whenInputScreenEnabledAndSwitchToNewTabThenLaunchInputScreenCommandTriggered() =
         runTest {

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

@@ -1018,7 +1018,15 @@ class BrowserWebViewClientTest {
     fun whenPageFinishesBeforeStartingThenPixelIsNotFired() {
         val mockWebView = getImmediatelyInvokedMockWebView()
         testee.onPageFinished(mockWebView, EXAMPLE_URL)
-        verify(pageLoadedHandler, never()).onPageLoaded(any(), any(), any(), any(), any())
+        verify(pageLoadedHandler, never()).onPageLoaded(
+            any(),
+            any(),
+            any(),
+            any(),
+            any(),
+            any(),
+            any(),
+        )
     }
 
     @Test
@@ -1032,7 +1040,15 @@ class BrowserWebViewClientTest {
         testee.onPageFinished(mockWebView, EXAMPLE_URL)
         val startArgumentCaptor = argumentCaptor<Long>()
         val endArgumentCaptor = argumentCaptor<Long>()
-        verify(pageLoadedHandler).onPageLoaded(any(), eq(null), startArgumentCaptor.capture(), endArgumentCaptor.capture(), any())
+        verify(pageLoadedHandler).onPageLoaded(
+            any(),
+            eq(null),
+            startArgumentCaptor.capture(),
+            endArgumentCaptor.capture(),
+            any(),
+            any(),
+            any(),
+        )
         assertEquals(0L, startArgumentCaptor.firstValue)
         assertEquals(10L, endArgumentCaptor.firstValue)
     }
@@ -1045,7 +1061,7 @@ class BrowserWebViewClientTest {
         whenever(mockWebView.settings).thenReturn(mock())
         testee.onPageStarted(mockWebView, "about:blank", null)
         testee.onPageFinished(mockWebView, "about:blank")
-        verify(pageLoadedHandler, never()).onPageLoaded(any(), any(), any(), any(), any())
+        verify(pageLoadedHandler, never()).onPageLoaded(any(), any(), any(), any(), any(), any(), any())
     }
 
     @Test
@@ -1054,7 +1070,7 @@ class BrowserWebViewClientTest {
         whenever(mockWebView.settings).thenReturn(mock())
         testee.onPageStarted(mockWebView, EXAMPLE_URL, null)
         testee.onPageFinished(mockWebView, EXAMPLE_URL)
-        verify(pageLoadedHandler, never()).onPageLoaded(any(), any(), any(), any(), any())
+        verify(pageLoadedHandler, never()).onPageLoaded(any(), any(), any(), any(), any(), any(), any())
     }
 
     @Test
@@ -1087,7 +1103,15 @@ class BrowserWebViewClientTest {
 
         val startArgumentCaptor = argumentCaptor<Long>()
         val endArgumentCaptor = argumentCaptor<Long>()
-        verify(pageLoadedHandler).onPageLoaded(any(), eq(null), startArgumentCaptor.capture(), endArgumentCaptor.capture(), any())
+        verify(pageLoadedHandler).onPageLoaded(
+            any(),
+            eq(null),
+            startArgumentCaptor.capture(),
+            endArgumentCaptor.capture(),
+            any(),
+            any(),
+            any(),
+        )
         assertEquals(0L, startArgumentCaptor.firstValue)
         assertEquals(10L, endArgumentCaptor.firstValue)
     }
@@ -1109,7 +1133,15 @@ class BrowserWebViewClientTest {
         testee.onPageFinished(mockWebView, EXAMPLE_URL)
         val startArgumentCaptor = argumentCaptor<Long>()
         val endArgumentCaptor = argumentCaptor<Long>()
-        verify(pageLoadedHandler).onPageLoaded(any(), eq(null), startArgumentCaptor.capture(), endArgumentCaptor.capture(), any())
+        verify(pageLoadedHandler).onPageLoaded(
+            any(),
+            eq(null),
+            startArgumentCaptor.capture(),
+            endArgumentCaptor.capture(),
+            any(),
+            any(),
+            any(),
+        )
         assertEquals(5L, startArgumentCaptor.firstValue)
         assertEquals(10L, endArgumentCaptor.firstValue)
     }