Skip to content

Commit

Permalink
Use anchor links for add click maestro tests (#3065)
Browse files Browse the repository at this point in the history 
<!--
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)
    3. Make sure these changes are tested in API 23 and API 26
If your PR does not involve UI changes, you can remove the **UI
changes** section
-->

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

### Description
This PR changes the ad click maestro tests to use anchor links instead
of scrolling

### Steps to test this PR

- [ ] Maestro tests should pass, see
https://github.com/duckduckgo/Android/actions/runs/4699277675

---------

Co-authored-by: Cristian Monforte <cristian@duckduckgo.com>
  • Loading branch information
@marcosholgado @cmonfortep
marcosholgado and cmonfortep authored Apr 18, 2023
1 parent 292d3bd commit ba61cd5
Show file tree
Hide file tree
Showing 24 changed files with 27 additions and 89 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/end-to-end.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;

- name: Ad click detection flows
uses: mobile-dev-inc/action-maestro-cloud@v1.2.3
uses: mobile-dev-inc/action-maestro-cloud@v1.3.1
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
Expand All @@ -64,7 +64,7 @@ jobs:

- name: Privacy Tests
if: always()
uses: mobile-dev-inc/action-maestro-cloud@v1.2.3
uses: mobile-dev-inc/action-maestro-cloud@v1.3.1
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
Expand All @@ -74,7 +74,7 @@ jobs:

- name: Release Tests
if: always()
uses: mobile-dev-inc/action-maestro-cloud@v1.2.3
uses: mobile-dev-inc/action-maestro-cloud@v1.3.1
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
Expand All @@ -84,7 +84,7 @@ jobs:

- name: Notifications permissions Android 13+
if: always()
uses: mobile-dev-inc/action-maestro-cloud@v1.2.3
uses: mobile-dev-inc/action-maestro-cloud@v1.3.1
with:
api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
name: ${{ github.sha }}
Expand Down
6 changes: 1 addition & 5 deletions ...ion_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-10"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,10 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-10"
- tapOn:
Expand Down
6 changes: 1 addition & 5 deletions ...ng-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)_(u3_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-11"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,10 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-11"
- tapOn:
Expand Down
7 changes: 1 addition & 6 deletions ...-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)__(dsl_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-12"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-12"
- tapOn:
Expand Down
7 changes: 1 addition & 6 deletions ...t_it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)_(u3_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-13"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-13"
- tapOn:
Expand Down
7 changes: 1 addition & 6 deletions ...it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)__(dsl_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-14"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-14"
- tapOn:
Expand Down
2 changes: 1 addition & 1 deletion ...o/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-1"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
2 changes: 1 addition & 1 deletion .../ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-2"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
2 changes: 1 addition & 1 deletion ...d_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-3"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand Down
3 changes: 1 addition & 2 deletions ..._click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-4"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,7 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- assertVisible:
id: "ad-id-4"
- tapOn:
Expand Down
3 changes: 1 addition & 2 deletions ...ck_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,7 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
4 changes: 1 addition & 3 deletions ...k_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-6"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,8 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- assertVisible:
id: "ad-id-6"
- tapOn:
Expand Down
4 changes: 1 addition & 3 deletions .../ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- 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:
text: ".*Got It.*"
Expand All @@ -18,8 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- assertVisible:
id: "ad-id-7"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions ...ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-8"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-8"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions ...ction_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-9"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- scroll
- scroll
- scroll
- assertVisible:
id: "ad-id-9"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- longPressOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
5 changes: 1 addition & 4 deletions .maestro/privacy_tests/6_-_Multi-tab.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android
- tapOn: "cancel"
- assertVisible:
text: ".*I'll also upgrade the security of your connection if possible.*"
- inputText: "https://www.search-company.site/"
- inputText: "https://www.search-company.site/#ad-id-5"
- pressKey: Enter
- assertVisible:
text: ".*Got It.*"
Expand All @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android
text: "HIDE TIPS FOREVER"
- tapOn:
text: "HIDE TIPS FOREVER"
- swipe:
start: 100,1000
end: 100,200
- assertVisible:
id: "ad-id-5"
- tapOn:
Expand Down
Loading

0 comments on commit ba61cd5

Please sign in to comment.