Merge remote-tracking branch 'github/feat/more-e2e-tests-2' into develop

.envrc

@@ -33,4 +33,4 @@ export MAESTRO_APP_PASSWORD=${MAESTRO_APP_PASSWORD:-}
 
 # Optional Env Vars
 
-export MAESTRO_DRIVER_STARTUP_TIMEOUT=${MAESTRO_DRIVER_STARTUP_TIMEOUT:-15000}
+# export MAESTRO_DRIVER_STARTUP_TIMEOUT=${MAESTRO_DRIVER_STARTUP_TIMEOUT:-15000}

.maestro/auth-tests/login-password-toggle.yaml

@@ -11,19 +11,25 @@ env:
 ---
 - clearState
 - launchApp
-- assertVisible: "Crisis Cleanup"
 - assertVisible:
-    text: "Login"
-    index: 0
-- assertVisible: "Email"
-- assertVisible: "Password"
-- tapOn: "Password"
+    id: ccuLogo
+- assertVisible:
+    id: loginHeaderText
+- assertVisible:
+    id: loginEmailTextField
+- assertVisible:
+    id: loginPasswordTextField
+- tapOn:
+    id: loginPasswordTextField
 - inputText: ${TEST_PASSWORD}
 # Password should be hidden initially
 - assertNotVisible: ${TEST_PASSWORD}
-- assertVisible: "Show"
-- tapOn: "Show"
+- assertVisible:
+    id: textFieldShowIcon
+- tapOn:
+    id: textFieldShowIcon
 - assertVisible: ${TEST_PASSWORD}
-- tapOn: "Hide"
+- tapOn:
+    id: textFieldHideIcon
 - assertNotVisible: ${TEST_PASSWORD}
 

.maestro/auth-tests/login-view.yaml

@@ -9,12 +9,13 @@ tags:
 ---
 - clearState
 - launchApp
-- assertVisible: "Crisis Cleanup"
 - assertVisible:
-    text: "Login"
-    index: 0
-- assertVisible: ".*Email.*"
-- assertVisible: ".*Password.*"
+    id: ccuLogo
 - assertVisible:
-    text: "Login"
-    index: 1
+    id: loginHeaderText
+- assertVisible:
+    id: loginEmailTextField
+- assertVisible:
+    id: loginPasswordTextField
+- assertVisible:
+    id: loginLoginBtn

.maestro/auth-tests/login.yaml

@@ -9,12 +9,15 @@ tags:
 ---
 - clearState
 - launchApp
-- tapOn: "Email"
+- tapOn:
+    id: loginEmailTextField
 - inputText: ${MAESTRO_APP_EMAIL}
-- tapOn: "Password"
+- tapOn:
+    id: loginPasswordTextField
 - inputText: ${MAESTRO_APP_PASSWORD}
 - tapOn:
-    text: "Login"
-    index: 1
-- assertVisible: "Work"
-- assertVisible: "Menu"
+    id: loginLoginBtn
+- assertVisible:
+    id: navItem_Work
+- assertVisible:
+    id: navItem_Menu

.maestro/auth-tests/logout.yaml

@@ -10,12 +10,17 @@ onFlowStart:
   - runFlow: login.yaml
 ---
 - launchApp
-- assertVisible: "Work"
-- assertVisible: "Menu"
-- tapOn: "Menu"
-- tapOn: "Account"
-- tapOn: "Logout"
-- assertVisible: "Crisis Cleanup"
 - assertVisible:
-    text: "Login"
-    index: 0
+    id: navItem_Work
+- assertVisible:
+    id: navItem_Menu
+- tapOn:
+    id: navItem_Menu
+- tapOn:
+    id: topBarAvatarIconBtn
+- tapOn:
+    id: authedProfileLogoutBtn
+- assertVisible:
+    id: ccuLogo
+- assertVisible:
+    id: loginHeaderText

.maestro/auth-tests/profile-view.yaml

@@ -10,11 +10,16 @@ onFlowStart:
   - runFlow: login.yaml
 ---
 - launchApp
-- tapOn: "Menu"
-- tapOn: "Account"
-- assertVisible: .*crisis.*cleanup.*
+- tapOn:
+    id: navItem_Menu
+- tapOn:
+    id: topBarAvatarIconBtn
+- assertVisible:
+    id: ccuLogo
 # Currently logged in user's email should be visible on profile page
 - assertVisible: .*${MAESTRO_APP_EMAIL}.*
-- assertVisible: .*logout.*
-- assertVisible: .*dismiss.*
+- assertVisible:
+    id: authedProfileLogoutBtn
+- assertVisible:
+    id: authedProfileDismissBtn
 

.maestro/work-tests/filters-change.yaml

@@ -0,0 +1,114 @@
+name: Work filter changes
+appId: ${MAESTRO_APP_ID}
+tags:
+  - development
+  - staging
+  - production
+  - pull-request
+env:
+  APPLY_FILTERS_BTN_TEXT: "Apply filters"
+  CLEAR_FILTERS_BTN_TEXT: "Clear filters"
+onFlowStart:
+  - runFlow: ../auth-tests/login.yaml
+---
+# wait for incidents to load
+- waitForAnimationToEnd:
+    timeout: 5000
+# wait till spinner is invisible
+- assertNotVisible:
+    id: workIncidentsLoadingIndicator
+- tapOn:
+    id: "workIncidentFilterBtn"
+- assertVisible: "Filters"
+
+- assertVisible:
+    id: "filterClearFiltersBtn"
+- assertVisible:
+    id: "filterApplyFiltersBtn"
+
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT}"
+
+- scrollUntilVisible:
+    element:
+      id: "filterRadioBtn_5 miles"
+    direction: DOWN
+- tapOn:
+    id: "filterRadioBtn_5 miles"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (1)"
+
+- scrollUntilVisible:
+    element:
+      id: "filterCheckbox_worksiteFilters.unclaimed"
+    direction: DOWN
+- tapOn:
+    id: "filterCheckbox_worksiteFilters.unclaimed"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (2)"
+
+- scrollUntilVisible:
+    element:
+      id: "filterCheckbox_worksiteFilters.open"
+    direction: DOWN
+- tapOn:
+    id: "filterCheckbox_worksiteFilters.open"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (3)"
+
+- scrollUntilVisible:
+    element:
+      id: "filterCheckbox_open_assigned"
+    direction: DOWN
+- tapOn:
+    id: "filterCheckbox_open_assigned"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (4)"
+
+- scrollUntilVisible:
+    element:
+      id: "filterCheckbox_formLabels.older_than_60"
+    direction: DOWN
+- tapOn:
+    id: "filterCheckbox_formLabels.older_than_60"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (5)"
+
+- scrollUntilVisible:
+    element:
+      id: "filterCheckbox_flag.worksite_high_priority"
+    direction: DOWN
+- tapOn:
+    id: "filterCheckbox_flag.worksite_high_priority"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (6)"
+
+# Apply selected filters
+- tapOn:
+    id: "filterApplyFiltersBtn"
+
+# Small indicator number beside filters button
+- assertVisible:
+    id: "filterButtonBadge_6"
+
+# Reopen filters popup
+- tapOn:
+    id: "workIncidentFilterBtn"
+
+# Originally selected filters should be selected
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT} (6)"
+
+# Clear filters
+- tapOn:
+    id: "filterClearFiltersBtn"
+- assertVisible:
+    text: "${APPLY_FILTERS_BTN_TEXT}"
+
+# Apply cleared filters
+- tapOn:
+    id: "filterApplyFiltersBtn"
+
+# Small indicator number beside filters button should not be visible
+- assertNotVisible:
+    id: "filterButtonBadge_6"

.maestro/work-tests/filters-headers.yaml

@@ -8,44 +8,54 @@ tags:
 onFlowStart:
   - runFlow: ../auth-tests/login.yaml
 ---
-- tapOn: "Filters"
+# wait for incidents to load
+- waitForAnimationToEnd:
+    timeout: 5000
+# wait till spinner is invisible
+- assertNotVisible:
+    id: workIncidentsLoadingIndicator
+- tapOn:
+    id: "workIncidentFilterBtn"
 - assertVisible: "Filters"
 
 - scrollUntilVisible:
-    element: "Vulnerability"
+    element:
+        id: filterHeaderCollapsibleTitle_Distance
     direction: DOWN
 - assertVisible:
-    text: "Vulnerability"
-    index: 1
+    id: "filterHeaderCollapsibleTitle_Distance"
 
 - scrollUntilVisible:
-    element: "Distance"
+    element:
+        id: filterHeaderCollapsibleTitle_General
     direction: DOWN
-- assertVisible: "Distance"
-
-- scrollUntilVisible:
-    element: "General"
-    direction: DOWN
-- assertVisible: "General"
+- assertVisible:
+    id: "filterHeaderCollapsibleTitle_General"
 
 - scrollUntilVisible:
-    element: "Personal Info"
+    element:
+        id: "filterHeaderCollapsibleTitle_Personal Info"
     direction: DOWN
 - assertVisible:
-    text: "Personal Info"
-    index: 0
+    id: "filterHeaderCollapsibleTitle_Personal Info"
 
 - scrollUntilVisible:
-    element: "Flags"
+    element:
+        id: "filterHeaderCollapsibleTitle_Flags"
     direction: DOWN
-- assertVisible: "Flags"
+- assertVisible:
+    id: "filterHeaderCollapsibleTitle_Flags"
 
 - scrollUntilVisible:
-    element: "Work"
+    element:
+        id: "filterHeaderCollapsibleTitle_Work"
     direction: DOWN
-- assertVisible: "Work"
+- assertVisible:
+    id: "filterHeaderCollapsibleTitle_Work"
 
 - scrollUntilVisible:
-    element: "Dates"
+    element:
+        id: "filterHeaderCollapsibleTitle_Dates"
     direction: DOWN
-- assertVisible: "Dates"
+- assertVisible:
+    id: "filterHeaderCollapsibleTitle_Dates"

.maestro/work-tests/incident-change.yaml

@@ -8,15 +8,21 @@ tags:
 onFlowStart:
   - runFlow: ../auth-tests/login.yaml
 env:
-  INCIDENT_SELECTOR_COORDS: "9%,9%"
+  INCIDENT_SELECTOR_ID: appIncidentSelector
   FIRST_INCIDENT: ".*(flood|tornado).*"
   SECOND_INCIDENT: ".*(storm|hurricane|fire).*"
 ---
+# wait for incidents to load
+- waitForAnimationToEnd:
+    timeout: 5000
+# wait till spinner is invisible
+- assertNotVisible:
+    id: workIncidentsLoadingIndicator
 - tapOn: "Menu"
 
 # Find first type incident and select it
 - tapOn:
-    point: ${INCIDENT_SELECTOR_COORDS}
+    id: ${INCIDENT_SELECTOR_ID}
 - assertVisible: "Change Incident"
 
 - scrollUntilVisible:
@@ -30,7 +36,7 @@ env:
 
 # Find second type of incident and select it
 - tapOn:
-    point: ${INCIDENT_SELECTOR_COORDS}
+    id: ${INCIDENT_SELECTOR_ID}
 - assertVisible: "Change Incident"
 
 - scrollUntilVisible:
@@ -44,7 +50,7 @@ env:
 
 # Find first type of incident again and select it
 - tapOn:
-    point: ${INCIDENT_SELECTOR_COORDS}
+    id: ${INCIDENT_SELECTOR_ID}
 - assertVisible: "Change Incident"
 
 - scrollUntilVisible: