Switch to using tags

duckduckgo · Sep 13, 2023 · 3dd3b80 · 3dd3b80
1 parent 7e4d72a
commit 3dd3b80
Show file tree

Hide file tree

Showing 28 changed files with 98 additions and 21 deletions.
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -48,21 +48,24 @@ jobs:
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
-        workspace: .maestro/release_tests
+        workspace: .maestro
+        include-tags: release
 
     - name: Privacy tests
       uses: mobile-dev-inc/[email protected]
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
-        workspace: .maestro/privacy_tests
+        workspace: .maestro
+        include-tags: privacy
 
     - name: Ad Click Detection Flow tests
       uses: mobile-dev-inc/[email protected]
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
-        workspace: .maestro/privacy_tests
+        workspace: .maestro
+        include-tags: adClick
 
     - name: Create Asana task when workflow failed
       if: ${{ failure() }}

diff --git a/.../ad_click_detection_flow_tests/01_yjs_heuristic_no_ad_domain_param_u3_param_included.yaml b/.../ad_click_detection_flow_tests/01_yjs_heuristic_no_ad_domain_param_u3_param_included.yaml
@@ -1,6 +1,7 @@
-# yjs_heuristic_no_ad_domain_param_u3_param_included.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 
 # Set up 

diff --git a/...ad_click_detection_flow_tests/02_mjs_heuristic_no_ad_domain_param_dsl_param_included.yaml b/...ad_click_detection_flow_tests/02_mjs_heuristic_no_ad_domain_param_dsl_param_included.yaml
@@ -1,6 +1,7 @@
-# mjs_heuristic_no_ad_domain_param_dsl_param_included.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 
 # Set up 

diff --git a/..._click_detection_flow_tests/03_yjs_heuristic_no_ad_domain_param_but_missing_u3_param.yaml b/..._click_detection_flow_tests/03_yjs_heuristic_no_ad_domain_param_but_missing_u3_param.yaml
@@ -1,6 +1,7 @@
-# yjs_heuristic_no_ad_domain_param_but_missing_u3_param.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 
 # Set up 

diff --git a/...click_detection_flow_tests/04_mjs_heuristic_no_ad_domain_param_but_missing_dsl_param.yaml b/...click_detection_flow_tests/04_mjs_heuristic_no_ad_domain_param_but_missing_dsl_param.yaml
@@ -1,6 +1,7 @@
-# _mjs_heuristic_no_ad_domain_param_but_missing_dsl_param.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 
 # Set up 

diff --git a/...ick_detection_flow_tests/05_yjs_heuristic_ad_domain_provided_but_empty_u3_not_needed.yaml b/...ick_detection_flow_tests/05_yjs_heuristic_ad_domain_provided_but_empty_u3_not_needed.yaml
@@ -1,6 +1,7 @@
-# yjs_heuristic_ad_domain_provided_but_empty_u3_not_needed.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 
 # Set up 

diff --git a/...ck_detection_flow_tests/06_mjs_heuristic_ad_domain_provided_but_empty_dsl_not_needed.yaml b/...ck_detection_flow_tests/06_mjs_heuristic_ad_domain_provided_but_empty_dsl_not_needed.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 - clearState
 - launchApp

diff --git a/.../ad_click_detection_flow_tests/07_yjs_bing-provided_ad_domain_provided_u3_not_needed.yaml b/.../ad_click_detection_flow_tests/07_yjs_bing-provided_ad_domain_provided_u3_not_needed.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 - clearState
 - launchApp
@@ -24,7 +27,7 @@ appId: com.duckduckgo.mobile.ios
         text: "Got It"
         index: 0
     file: ../shared/onboarding_browsing.yaml
-    
+
 - assertVisible:
     text: "[Ad 7] SERP Ad (SERP-provided)"
 - tapOn:

diff --git a/...ad_click_detection_flow_tests/08_mjs_bing-provided_ad_domain_provided_dsl_not_needed.yaml b/...ad_click_detection_flow_tests/08_mjs_bing-provided_ad_domain_provided_dsl_not_needed.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
 - clearState
 - launchApp

diff --git a/...ction_flow_tests/09_yjs_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml b/...ction_flow_tests/09_yjs_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/...tion_flow_tests/10_mjs_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml b/...tion_flow_tests/10_mjs_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/...low_tests/11_yjs_bing-provided_ad_domain_provided_but_its_not_a_domain_u3_not_needed.yaml b/...low_tests/11_yjs_bing-provided_ad_domain_provided_but_its_not_a_domain_u3_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/...ow_tests/12_mjs_bing-provided_ad_domain_provided_but_its_not_a_domain_dsl_not_needed.yaml b/...ow_tests/12_mjs_bing-provided_ad_domain_provided_but_its_not_a_domain_dsl_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/...yjs_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_u3_not_needed.yaml b/...yjs_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_u3_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/...js_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_dsl_not_needed.yaml b/...js_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_dsl_not_needed.yaml
@@ -1,5 +1,9 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - adClick
+
 ---
+
 - clearState
 - launchApp
 - runFlow: 

diff --git a/.maestro/privacy_tests/01_single-site_single-tab_session.yaml b/.maestro/privacy_tests/01_single-site_single-tab_session.yaml
@@ -1,6 +1,7 @@
-# single_site-single_tab.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/02_single-site_new_tab_session.yaml b/.maestro/privacy_tests/02_single-site_new_tab_session.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/03_single-site_new-tab_session_variant_two.yaml b/.maestro/privacy_tests/03_single-site_new-tab_session_variant_two.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/04_single-site_multi-tab_session.yaml b/.maestro/privacy_tests/04_single-site_multi-tab_session.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/05_multi-site_single-tab_session.yaml b/.maestro/privacy_tests/05_multi-site_single-tab_session.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 
@@ -28,7 +31,6 @@ appId: com.duckduckgo.mobile.ios
     file: ../shared/onboarding_browsing.yaml
 
 # Test
-- scroll
 - assertVisible: "[Ad 5] SERP Ad (heuristic)"
 - tapOn: "[Ad 5] SERP Ad (heuristic)"
 - assertVisible:

diff --git a/.maestro/privacy_tests/06_multi-tab.yaml b/.maestro/privacy_tests/06_multi-tab.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/07_browser_restart_mid-session.yaml b/.maestro/privacy_tests/07_browser_restart_mid-session.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/08_navigation_with_back_forward.yaml b/.maestro/privacy_tests/08_navigation_with_back_forward.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/privacy_tests/09_navigation_with_refresh.yaml b/.maestro/privacy_tests/09_navigation_with_refresh.yaml
@@ -1,4 +1,7 @@
 appId: com.duckduckgo.mobile.ios
+tags:
+    - privacy
+
 ---
 
 # Set up 

diff --git a/.maestro/release_tests/bookmarks.yaml b/.maestro/release_tests/bookmarks.yaml
@@ -1,7 +1,10 @@
 # bookmarks.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
 ---
+
 # Set up 
 - clearState
 - launchApp

diff --git a/.maestro/release_tests/browsing.yaml b/.maestro/release_tests/browsing.yaml
@@ -1,7 +1,10 @@
 # browsing.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
 ---
+
 # Set up 
 - clearState
 - launchApp

diff --git a/.maestro/release_tests/favorites.yaml b/.maestro/release_tests/favorites.yaml
@@ -1,7 +1,10 @@
 # favorites.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
 ---
+
 # Set up 
 - clearState
 - launchApp

diff --git a/.maestro/release_tests/tabs.yaml b/.maestro/release_tests/tabs.yaml
@@ -1,7 +1,10 @@
 # tabs.yaml
-
 appId: com.duckduckgo.mobile.ios
+tags:
+    - release
+
 ---
+
 # Set up 
 - clearState
 - launchApp