Merge branch 'main' into Hani/address_doorhanger_captures_email_telephone

Author: Hani Yacoub

.cron.yml

@@ -27,7 +27,7 @@ jobs:
       - {hour: 17, minute: 15}
       - {hour: 18, minute: 15}
       - {hour: 19, minute: 15}
-      - {hour: 20, minute: 15}
+      - {hour: 20, minute: 00}
       - {hour: 21, minute: 15}
       - {hour: 22, minute: 15}
       - {hour: 23, minute: 15}

.github/workflows/check-beta.yml

@@ -2,7 +2,7 @@ name: Check new beta version
 
 on:
   schedule:
-    - cron: "16 */1 * * *"
+    - cron: "49 */1 * * *"
 env:
   LATEST: ""
 permissions:
@@ -11,55 +11,20 @@ permissions:
 jobs:
   Check-Beta-Version:
     runs-on: ubuntu-latest
-    outputs:
-      win_tested: ${{ steps.check_latest.outputs.win }}
-      mac_tested: ${{ steps.check_latest.outputs.mac }}
-      beta-version: ${{ steps.check_latest.outputs.beta-version }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            get_beta_version.py
-            win-latest-reported-version
-            mac-latest-reported-version
-          sparse-checkout-cone-mode: false
-      - name: Obtain the latest beta version number
+      - name: Check if the run is reportable
+        env: 
+          TESTRAIL_REPORT: true
+          TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
+          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
+          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
         run: |
-          pip3 install beautifulsoup4
-          echo "LATEST=$(python3 ./get_beta_version.py)" >> "$GITHUB_ENV"
-      - name: Check if the latest version was tested
-        id: check_latest
-        run: |
-          TESTED_WIN=$(cat ./win-latest-reported-version)
-          if [ "$LATEST" = "$TESTED_WIN" ]; then
-            echo "win=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "win=false" >> "$GITHUB_OUTPUT"
-          fi
-          TESTED_MAC=$(cat ./mac-latest-reported-version)
-          if [ "$LATEST" = "$TESTED_MAC" ]; then
-            echo "mac=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "mac=false" >> "$GITHUB_OUTPUT"
-          fi
-          echo "beta-version=$LATEST" >> "$GITHUB_OUTPUT"
-
-  # Run the beta if the newest version has not been tested
-  Run-Win-Smoke:
-    needs: Check-Beta-Version
-    if: needs.Check-Beta-Version.outputs.win_tested == 'false'
-    uses: ./.github/workflows/smoke.yml
-    with:
-      job_to_run: Smoke-Windows
-      beta-version: ${{ needs.Check-Beta-Version.outputs.beta-version }}
-    secrets: inherit
-
-  Run-Mac-Smoke:
+          pip3 install 'pipenv==2023.11.15';
+          pipenv install
+          pipenv run python -c 'from modules import testrail_integration as tri; import sys; sys.exit(0) if tri.reportable() else sys.exit(100)'
+  Run-Smoke-Tests:
     needs: Check-Beta-Version
-    if: needs.Check-Beta-Version.outputs.mac_tested == 'false'
     uses: ./.github/workflows/smoke.yml
-    with:
-      job_to_run: Smoke-MacOS
-      beta-version: ${{ needs.Check-Beta-Version.outputs.beta-version }}
     secrets: inherit

.github/workflows/smoke.yml

@@ -5,15 +5,6 @@ run-name: ${{ github.actor }} is running smoke tests
 on:
   pull_request:
   workflow_call:
-    inputs:
-      job_to_run:
-        required: true
-        type: string
-      beta-version:
-        required: true
-        type: string
-permissions:
-  contents: 'write'
 env:
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
@@ -22,7 +13,6 @@ env:
 
 jobs:
   Smoke-Windows:
-    if: ${{ inputs.job_to_run == 'Smoke-Windows' || github.event_name == 'pull_request'}}
     runs-on: windows-latest
     steps:
       - name: Create app token
@@ -40,11 +30,10 @@ jobs:
         with:
           python-version: "3.11"
       - name: Set Environment
-        if: ${{ inputs.job_to_run == 'Smoke-Windows' }}
+        if: ${{ github.event_name == 'schedule' }}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'
-          BETA_VERSION=${{ inputs.beta-version }}
           "@
           New-item -Name .env -Value $env_contents -ItemType File -Force
           Write-Host "Running report for most recent Beta on Windows"
@@ -78,39 +67,25 @@ jobs:
         shell: pwsh
       - name: Run Smoke Tests in Win
         if: steps.setup.conclusion == 'success'
-        env:
-          TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
-          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
-          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
         run: |
           pipenv run python -c "import sys; print(sys.platform)"
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
-          pipenv run pytest -n 4 $(python choose_ci_set.py)
+          pipenv run python choose_ci_set.py
+          pipenv run pytest -n 4 $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           mv artifacts artifacts-win || true
           exit $env:TEST_EXIT_CODE
-      - name: Commit Changed Tracker Files
-        if: ${{ inputs.job_to_run == 'Smoke-Windows' }}
-        run: |
-          git pull
-          git config --global user.email ${{ github.actor }}@users.noreply.github.com;
-          git config --global user.name ${{ github.actor }};
-          git add win-latest-reported-version;
-          git commit -m "update windows reported version";
-          git push
       - name: Run Smoke Tests in Win (Headed)
         if: steps.setup.conclusion == 'success' && always()
         env:
-          TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
-          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
-          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
           REPORTABLE: true
         run: |
           rm ./pyproject.toml;
           mv ./ci_pyproject_headed.toml ./pyproject.toml;
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
-          pipenv run pytest $(python choose_ci_set.py)
+          pipenv run python choose_ci_set.py
+          pipenv run pytest $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           rm artifacts/assets -r -Force
           Get-ChildItem -Path "artifacts" | ForEach-Object {
@@ -131,7 +106,6 @@ jobs:
           name: artifacts-win
           path: artifacts-win
   Smoke-MacOS:
-    if: ${{ inputs.job_to_run == 'Smoke-MacOS' || github.event_name == 'pull_request'}}
     runs-on: macos-latest
     steps:
       - name: Create app token
@@ -152,11 +126,11 @@ jobs:
         run: |
           python check_test_cases.py
           exit $?
+          echo "Triggered by event: ${{ github.event_name }}"
       - name: Set Environment
-        if: ${{ inputs.job_to_run == 'Smoke-MacOS' }}
-        run:
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
-          echo "BETA_VERSION=${{ inputs.beta-version }}" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";
       - name: Install dependencies
         id: setup        
@@ -171,35 +145,22 @@ jobs:
       - name: Run Smoke Tests in MacOS
         if: steps.setup.conclusion == 'success'
         env:
-          TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
-          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
-          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
           FX_EXECUTABLE: /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox
         run: |
           /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox --version
-          pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(python choose_ci_set.py) || TEST_EXIT_CODE=$?
+          pipenv run python choose_ci_set.py
+          pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(cat selected_tests) || TEST_EXIT_CODE=$?
           mv artifacts artifacts-mac || true
           exit $TEST_EXIT_CODE
-      - name: Commit Changed Tracker Files
-        if: ${{ inputs.job_to_run == 'Smoke-MacOS' }}
-        run: |
-          git pull
-          git config --global user.email ${{ github.actor }}@users.noreply.github.com;
-          git config --global user.name ${{ github.actor }};
-          git add mac-latest-reported-version;
-          git commit -m "update macos reported version";
-          git push
       - name: Run Smoke Tests in MacOS (Headed)
         if: steps.setup.conclusion == 'success' && always()
         env:
-          TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
-          TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
-          TESTRAIL_USERNAME: ${{ secrets.TESTRAIL_USERNAME }}
           FX_EXECUTABLE: /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox
           REPORTABLE: true
         run: |
           mv ./ci_pyproject_headed.toml ./pyproject.toml;
-          pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(python choose_ci_set.py) || TEST_EXIT_CODE=$?
+          pipenv run python choose_ci_set.py
+          pipenv run pytest --fx-executable="$FX_EXECUTABLE" $(cat selected_tests) || TEST_EXIT_CODE=$?
           mv -n artifacts/* artifacts-mac/ || true
           exit $TEST_EXIT_CODE
       - name: Upload artifacts

.gitignore

@@ -5,6 +5,7 @@
 .tmp*
 .testrail_credential*
 .DS_Store
+selected_tests
 test*.txt
 fx_location
 test*txt

SELECTOR_INFO.md

@@ -1418,6 +1418,13 @@ Location: Any history item in the Hamburger history list
 Path to .json: modules/data/context_menu.components.json
 ```
 ```
+Selector Name: context-menu-add-search-engine
+Selector Data: "context-menu-add-engine"
+Description: Awesomebar context click option "Add <search engine>"
+Location: Any history item in the Hamburger history list
+Path to .json: modules/data/context_menu.components.json
+```
+```
 Selector Name: context-menu-pin-tab
 Selector Data: "context_pinTab"
 Description: Tab context click option "Pin Tab"
@@ -2405,20 +2412,6 @@ Location: Private browsing mode
 Path to .json: modules/data/navigation.components.json
 ```
 ```
-Selector name: add-extra-search-engine
-Selector Data: [id*=urlbar-engine-one-off-item-engine--1][tooltiptext*='{0}']
-Description: Add extra search engine in the url bar
-Location: URL bar
-Path to .json: modules/data/navigation.components.json
-```
-```
-Selector name: search-one-off-engine-button
-Selector Data: [id*=urlbar-engine-one-off-item-engine][tooltiptext^='{0}']
-Description: Search one off engine button
-Location: URL bar search results
-Path to .json: modules/data/navigation.components.json
-```
-```
 Selector name: downloads-button
 Selector Data: downloads-button
 Description: Toolbar download button
@@ -2834,6 +2827,41 @@ Description: Search settings button in awesome bar
 Location: Address bar
 Path to .json: modules/data/navigation.components.json
 ```
+```
+Selector Name: searchmode-switcher
+Selector Data: urlbar-searchmode-switcher
+Description: searchmode switcher toolbar button
+Location: Address bar
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: searchmode-switcher-settings
+Selector Data: searchmode-switcher-popup-search-settings-button
+Description: Search settings button in the searchmode switcher dropdown
+Location: Address bar
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: search-mode-switcher-option
+Selector Data: toolbarbutton[label*='{title}']
+Description: Option by label in search mode list
+Location: Search mode of awesomebar
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: refresh-button-awesome-bar
+Selector Data: .urlbarView-action-btn[data-action=refresh]
+Description: Refresh button in the awesome bar
+Location: Address bar
+Path to .json: modules/data/navigation.components.json
+```
+```
+Selector Name: refresh-firefox-dialog
+Selector Data: window-modal-dialog
+Description: Refresh Firefox dialog window
+Location: Dialog window
+Path to .json: modules/data/navigation.components.json
+```
 #### panel_ui
 ```
 Selector name: panel-ui-button
@@ -3420,13 +3448,6 @@ Location: In the tabbed browser.
 Path to .json: modules/data/tab_bar.components.json
 ```
 ```
-Selector name: tab-sound-label
-Selector Data: "tab-icon-sound-{status}-label"
-Description: A tab's sound status
-Location: In the tabbed browser.
-Path to .json: modules/data/tab_bar.components.json
-```
-```
 Selector name: tab-title
 Selector Data: "tab-text"
 Description: Gets the text of a Tab (it's title)