Skip to content

Commit

Permalink
Restructure maestro ad-click detection tests to use tags and shared o…
Browse files Browse the repository at this point in the history
…nboarding flow (duckduckgo#3461)

<!--
Note: This checklist is a reminder of our shared engineering
expectations.
The items in Bold are required
If your PR involves UI changes:
1. Upload screenshots or screencasts that illustrate the changes before
/ after
2. Add them under the UI changes section (feel free to add more columns
if needed)
If your PR does not involve UI changes, you can remove the **UI
changes** section

At a minimum, make sure your changes are tested in API 23 and one of the
more recent API levels available.
-->

Task/Issue URL:
https://app.asana.com/0/488551667048375/1205258019391736/f

### Description
Restructures the maestro ad-click detection tests to use a tag
`adClickTest` and utilise the shared onboarding flow.

### Steps to test this PR
- [ ] Ensure privacy dashboard e2e workflow passed:
https://github.com/duckduckgo/Android/actions/runs/5867320667 (or if a
failure, it's not because of these changes and the failure is because of
known ANR that is getting fixed elsewhere)
  • Loading branch information
CDRussell authored Aug 16, 2023
1 parent 6cb7d08 commit 2fb3ff7
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 86 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ jobs:
name: ${{ github.sha }}
app-file: apk/release.apk
android-api-level: 30
workspace: .maestro/ad_click_detection_flows
workspace: .maestro
include-tags: adClickTest

- name: Privacy Tests
if: always()
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/privacy-dashboard-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ jobs:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
app-file: apk/release.apk
workspace: .maestro/ad_click_detection_flows
workspace: .maestro
include-tags: adClickTest

- name: Privacy Tests
if: always()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-10"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-11"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-12"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-13"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-14"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-1"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-2"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-3"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-4"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-6"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-6" # scroll until the ad-id-6 instead of ad-id-7 (context: https://app.asana.com/0/0/1204397066248823/1204415854211764/f)
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-8"
- pressKey: Enter
- assertVisible:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
appId: com.duckduckgo.mobile.android
tags:
- adClickTest
---
- launchApp:
clearState: true
- assertVisible:
text: ".*Not to worry! Searching and browsing privately.*"
- tapOn: "let's do it!"
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"

- runFlow: ../shared/onboarding.yaml

- inputText: "https://www.search-company.site/#ad-id-9"
- pressKey: Enter
- assertVisible:
Expand Down

0 comments on commit 2fb3ff7

Please sign in to comment.