Merge branch 'develop' into feature/ondrej/swiping-tabs

duckduckgo · Dec 18, 2024 · 2663e84 · 2663e84
2 parents fd40460 + e8aa0f8
commit 2663e84
Show file tree

Hide file tree

Showing 65 changed files with 3,176 additions and 2,928 deletions.
diff --git a/.github/workflows/end-to-end-robintest.yml b/.github/workflows/end-to-end-robintest.yml
@@ -115,4 +115,15 @@ jobs:
           timeout: 120
           app-file: apk/release.apk
           android-api-level: 33
-          workspace: .maestro/notifications_permissions_android13_plus
+          workspace: .maestro/notifications_permissions_android13_plus
+
+      - name: Create Asana task when workflow failed
+        if: ${{ failure() }}
+        uses: honeycombio/gha-create-asana-task@main
+        with:
+          asana-secret: ${{ secrets.GH_ASANA_SECRET }}
+          asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }}
+          asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }}
+          asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }}
+          asana-task-name: GH Workflow Failure - End to end tests (Robin)
+          asana-task-description: The end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}
diff --git a/.github/workflows/pr-review-notifications.yaml b/.github/workflows/pr-review-notifications.yaml
@@ -0,0 +1,14 @@
+name: Pull Request Reviewed -> Asana Sync
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  pr-reviewed:
+    name: Update Asana task -> PR reviewed
+    uses: duckduckgo/native-github-asana-sync/.github/workflows/pr-review-notifications.yml@david/improve-pr-notifications
+    with:
+      trigger-phrase: "Task/Issue URL:"
+    secrets:
+      asana_pat: ${{ secrets.GH_ASANA_SECRET }}
diff --git a/...ection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml b/...ection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml
@@ -2,49 +2,52 @@ appId: com.duckduckgo.mobile.android
 tags:
   - adClickTest
 ---
-- launchApp:
-    clearState: true
+- retry:
+    maxRetries: 3
+    commands:
+      - launchApp:
+          clearState: true
 
-- runFlow: ../shared/onboarding.yaml
+      - runFlow: ../shared/onboarding.yaml
 
-- inputText: "https://www.search-company.site/#ad-id-10"
-- pressKey: Enter
-- assertVisible:
-    text: ".*Got It.*"
-- tapOn:
-    text: "Got It"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
-- tapOn:
-    text: "Cancel"
-- assertVisible:
-    id: "ad-id-10"
-- tapOn:
-    id: "ad-id-10"
-- assertVisible:
-    text: "Publisher site"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
-- assertVisible:
-    text: "View Tracker Companies"
-- tapOn:
-    text: "View Tracker Companies"
-- assertVisible:
-    text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
-- assertVisible:
-    text: "About our Web Tracking Protections"
-- assertVisible:
-    text: ".*Ad Company"
-- assertVisible:
-    text: "convert.ad-company.site"
-- assertVisible:
-    text: "ad-company.site"
-- action: back
-- assertVisible:
-    text: "View Non-Tracker Companies"
-- tapOn:
-    text: "View Non-Tracker Companies"
-- assertVisible:
-    text: "We did not identify any requests from third-party domains."
-- assertVisible:
-    text: "About our Web Tracking Protections"
+      - inputText: "https://www.search-company.site/#ad-id-10"
+      - pressKey: Enter
+      - assertVisible:
+          text: ".*Got It.*"
+      - tapOn:
+          text: "Got It"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - tapOn:
+          text: "Cancel"
+      - assertVisible:
+          id: "ad-id-10"
+      - tapOn:
+          id: "ad-id-10"
+      - assertVisible:
+          text: "Publisher site"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - assertVisible:
+          text: "View Tracker Companies"
+      - tapOn:
+          text: "View Tracker Companies"
+      - assertVisible:
+          text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
+      - assertVisible:
+          text: ".*Ad Company"
+      - assertVisible:
+          text: "convert.ad-company.site"
+      - assertVisible:
+          text: "ad-company.site"
+      - action: back
+      - assertVisible:
+          text: "View Non-Tracker Companies"
+      - tapOn:
+          text: "View Non-Tracker Companies"
+      - assertVisible:
+          text: "We did not identify any requests from third-party domains."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
diff --git a/...js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml b/...js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml
@@ -2,55 +2,58 @@ appId: com.duckduckgo.mobile.android
 tags:
   - adClickTest
 ---
-- launchApp:
-    clearState: true
+- retry:
+    maxRetries: 3
+    commands:
+      - launchApp:
+          clearState: true
 
-- runFlow: ../shared/onboarding.yaml
+      - runFlow: ../shared/onboarding.yaml
 
-- inputText: "https://www.search-company.site/#ad-id-11"
-- pressKey: Enter
-- assertVisible:
-    text: ".*Got It.*"
-- tapOn:
-    text: "Got It"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
-- tapOn:
-    text: "Cancel"
-- assertVisible:
-    id: "ad-id-11"
-- tapOn:
-    id: "ad-id-11"
-- assertVisible:
-    text: "Publisher site"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
-- assertVisible:
-    text: "View Tracker Companies"
-- tapOn:
-    text: "View Tracker Companies"
-- assertVisible:
-    text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
-- assertVisible:
-    text: "About our Web Tracking Protections"
-- assertVisible:
-    text: ".*Ad Company"
-- assertVisible:
-    text: "ad-company.site"
-- action: back
-- assertVisible:
-    text: "View Non-Tracker Companies"
-- tapOn:
-    text: "View Non-Tracker Companies"
-- assertVisible:
-    text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
-- assertVisible:
-    text: "About our Web Tracking Protections"
-- assertVisible:
-    text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
-- assertVisible:
-    text: "How our search ads impact our protections"
-- assertVisible:
-    text: ".*Ad Company"
-- assertVisible:
-    text: "convert.ad-company.site"
+      - inputText: "https://www.search-company.site/#ad-id-11"
+      - pressKey: Enter
+      - assertVisible:
+          text: ".*Got It.*"
+      - tapOn:
+          text: "Got It"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - tapOn:
+          text: "Cancel"
+      - assertVisible:
+          id: "ad-id-11"
+      - tapOn:
+          id: "ad-id-11"
+      - assertVisible:
+          text: "Publisher site"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - assertVisible:
+          text: "View Tracker Companies"
+      - tapOn:
+          text: "View Tracker Companies"
+      - assertVisible:
+          text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
+      - assertVisible:
+          text: ".*Ad Company"
+      - assertVisible:
+          text: "ad-company.site"
+      - action: back
+      - assertVisible:
+          text: "View Non-Tracker Companies"
+      - tapOn:
+          text: "View Non-Tracker Companies"
+      - assertVisible:
+          text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
+      - assertVisible:
+          text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
+      - assertVisible:
+          text: "How our search ads impact our protections"
+      - assertVisible:
+          text: ".*Ad Company"
+      - assertVisible:
+          text: "convert.ad-company.site"
diff --git a/..._bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml b/..._bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml
@@ -2,55 +2,58 @@ appId: com.duckduckgo.mobile.android
 tags:
   - adClickTest
 ---
-- launchApp:
-    clearState: true
+- retry:
+    maxRetries: 3
+    commands:
+      - launchApp:
+          clearState: true
 
-- runFlow: ../shared/onboarding.yaml
+      - runFlow: ../shared/onboarding.yaml
 
-- inputText: "https://www.search-company.site/#ad-id-12"
-- pressKey: Enter
-- assertVisible:
-    text: ".*Got It.*"
-- tapOn:
-    text: "Got It"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
-- tapOn:
-    text: "Cancel"
-- assertVisible:
-    id: "ad-id-12"
-- tapOn:
-    id: "ad-id-12"
-- assertVisible:
-    text: "Publisher site"
-- tapOn:
-    id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
-- assertVisible:
-    text: "View Tracker Companies"
-- tapOn:
-    text: "View Tracker Companies"
-- assertVisible:
-    text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
-- assertVisible:
-    text: "About our Web Tracking Protections"
-- assertVisible:
-    text: ".*Ad Company"
-- assertVisible:
-    text: "ad-company.site"
-- action: back
-- assertVisible:
-    text: "View Non-Tracker Companies"
-- tapOn:
-    text: "View Non-Tracker Companies"
-- assertVisible:
-    text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
-- assertVisible:
-    text: "About our Web Tracking Protections"
-- assertVisible:
-    text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
-- assertVisible:
-    text: "How our search ads impact our protections"
-- assertVisible:
-    text: ".*Ad Company"
-- assertVisible:
-    text: "convert.ad-company.site"
+      - inputText: "https://www.search-company.site/#ad-id-12"
+      - pressKey: Enter
+      - assertVisible:
+          text: ".*Got It.*"
+      - tapOn:
+          text: "Got It"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/fireIconMenu"
+      - tapOn:
+          text: "Cancel"
+      - assertVisible:
+          id: "ad-id-12"
+      - tapOn:
+          id: "ad-id-12"
+      - assertVisible:
+          text: "Publisher site"
+      - tapOn:
+          id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
+      - assertVisible:
+          text: "View Tracker Companies"
+      - tapOn:
+          text: "View Tracker Companies"
+      - assertVisible:
+          text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
+      - assertVisible:
+          text: ".*Ad Company"
+      - assertVisible:
+          text: "ad-company.site"
+      - action: back
+      - assertVisible:
+          text: "View Non-Tracker Companies"
+      - tapOn:
+          text: "View Non-Tracker Companies"
+      - assertVisible:
+          text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
+      - assertVisible:
+          text: "About our Web Tracking Protections"
+      - assertVisible:
+          text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
+      - assertVisible:
+          text: "How our search ads impact our protections"
+      - assertVisible:
+          text: ".*Ad Company"
+      - assertVisible:
+          text: "convert.ad-company.site"