Merge branch 'main' into philimon/suite_refactor

Author: philimon-reset

.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:
@@ -15,10 +15,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - 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 'pipenv==2023.11.15';
           pipenv install
-          python3 -c 'from modules import testrail_integration as tri; import sys; sys.exit(0) if tri.reportable() else sys.exit(100)'
-      - name: Run smoke tests
-        uses: ./.github/workflows/smoke.yml
-        secrets: inherit
+          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
+    uses: ./.github/workflows/smoke.yml
+    secrets: inherit

.github/workflows/smoke.yml

@@ -5,8 +5,6 @@ run-name: ${{ github.actor }} is running smoke tests
 on:
   pull_request:
   workflow_call:
-permissions:
-  contents: 'write'
 env:
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
@@ -32,7 +30,7 @@ jobs:
         with:
           python-version: "3.11"
       - name: Set Environment
-        if: ${{ github.event_name == 'workflow_call' }}
+        if: ${{ github.event_name == 'schedule' }}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'
@@ -87,7 +85,7 @@ jobs:
           mv ./ci_pyproject_headed.toml ./pyproject.toml;
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           pipenv run python choose_ci_set.py
-          pipenv run pytest -n 4 $(cat selected_tests)
+          pipenv run pytest $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           rm artifacts/assets -r -Force
           Get-ChildItem -Path "artifacts" | ForEach-Object {
@@ -128,9 +126,10 @@ jobs:
         run: |
           python check_test_cases.py
           exit $?
+          echo "Triggered by event: ${{ github.event_name }}"
       - name: Set Environment
-        if: ${{ github.event_name == 'workflow_call' }}
-        run:
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";
       - name: Install dependencies
@@ -153,15 +152,6 @@ jobs:
           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: ${{ github.event_name == 'workflow_call' }}
-        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:

.gitignore

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

SELECTOR_INFO.md

@@ -1404,6 +1404,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"
@@ -2391,20 +2398,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,27 @@ 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 +3434,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)

choose_ci_set.py

@@ -74,19 +74,29 @@ def get_tests_by_model(
 
 def dedupe(run_list: list, slash: str) -> list:
     """For a run list, remove entries that are covered by more general entries."""
-    suites = []
     run_list = list(set(run_list))
-    for entry in run_list:
-        pieces = entry.split(slash)
-        if len(pieces) < 4:
-            suites.append(pieces[-1])
-
+    dotslashes = []
     removes = []
-    for entry in run_list:
-        pieces = entry.split(slash)
-        if len(pieces) > 3 and pieces[2] in suites:
-            removes.append(run_list.index(entry))
 
+    for i, entry in enumerate(run_list):
+        if (
+            not entry.startswith(".")
+            and not entry.startswith("\\")
+            and not entry.startswith("/")
+        ):
+            dotslashes.append(i)
+
+    for dotslash in dotslashes:
+        run_list[dotslash] = f".{slash}{run_list[dotslash]}"
+
+    for i, entry_a in enumerate(run_list):
+        for j, entry_b in enumerate(run_list):
+            if i == j:
+                continue
+            if entry_a in entry_b:
+                removes.append(j)
+
+    removes.sort(reverse=True)
     for remove in removes:
         del run_list[remove]
 

ci_pyproject.toml

@@ -16,7 +16,7 @@ markers = [
 testpaths = [
     "tests"
 ]
-addopts = "-vs --ci --run-headless --json-report --reruns 3 --reruns-delay 2 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
+addopts = "-vs --ci --run-headless --json-report --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
 
 [tool.ruff]
 target-version = "py310"

conftest.py

@@ -382,12 +382,6 @@ def pytest_sessionfinish(session):
     tr_session = tri.testrail_init()
     passes = tri.collect_changes(tr_session, report)
     tri.mark_results(tr_session, passes)
-    with open(".tmp_testrail_info") as fh:
-        (plan_title, config) = fh.read().split("|")
-    version = os.environ.get("BETA_VERSION")
-    prefix = config[:3].lower()
-    with open(f"{prefix}-latest-reported-version", "w") as fh:
-        fh.write(version)
 
 
 @pytest.fixture()

modules/browser_object_navigation.py

@@ -2,6 +2,7 @@
 
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver import Firefox
+from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.webelement import WebElement
@@ -179,6 +180,12 @@ def click_in_awesome_bar(self) -> BasePage:
         return self
 
     @BasePage.context_chrome
+    def context_click_in_awesome_bar(self) -> BasePage:
+        self.set_awesome_bar()
+        actions = ActionChains(self.driver)
+        actions.context_click(self.awesome_bar).perform()
+        return self
+     
     def get_download_button(self) -> WebElement:
         """
         Gets the download button WebElement

modules/browser_object_tabbar.py

@@ -19,10 +19,10 @@ class MediaStatus:
         """Fake enum: just return a string based on a constant name"""
 
         def __init__(self):
-            self.PLAYING = "playing"
+            self.PLAYING = "soundplaying"
             self.MUTED = "muted"
             self.AUTOPLAY_BLOCKED = "blocked"
-            self.PIP = "pip"
+            self.PIP = "pictureinpicture"
 
     MEDIA_STATUS = MediaStatus()
 
@@ -137,11 +137,7 @@ def expect_tab_sound_status(
     ) -> BasePage:
         """Check to see if the tab has an expected MediaStatus"""
         tab = self.get_tab(identifier)
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.actions.move_to_element(tab).perform()
-            self.expect(
-                EC.visibility_of(self.get_element("tab-sound-label", labels=[status]))
-            )
+        self.wait.until(lambda _: tab.get_attribute(status) is not None)
         return self
 
     def expect_title_contains(self, text: str) -> BasePage: