Separate Github Action changes from Travis code

Author: lenacohen

.github/workflows/test.yml

@@ -1,20 +1,21 @@
-name: Selenium Testing
+name: Tests
 
 on:
   push:
     branches:
       - master
       - travis-github-action
+      - travis-github-action-mv3
   pull_request:
   workflow_dispatch:
 
 jobs:
   test:
     runs-on: ubuntu-22.04
+    continue-on-error: ${{ matrix.job != 'lint' }}
     strategy:
       matrix:
-        job: [lint, firefox, firefox-beta, firefox-nightly, firefox-esr, edge-beta]
-        # job: [lint, firefox, edge-beta]
+        job: [lint, firefox, firefox-beta, firefox-nightly, firefox-esr, edge-beta, chrome, chrome-beta]
         include:
           - job: lint
             INFO: "lint"
@@ -37,7 +38,6 @@ jobs:
           - job: edge-beta
             INFO: "Edge Beta"
             BROWSER: "microsoft-edge-beta"
-            # Move Chrome tests into mv3 repo after testing: 
           - job: chrome
             INFO: "Chrome"
             BROWSER: "google-chrome-stable"
@@ -79,7 +79,6 @@ jobs:
         uses: browser-actions/setup-edge@v1
         with:
           edge-version: beta
-        # Why do we test with Edge Beta but not Edge?
 
       - name: Set up Chrome
         if:  ${{ contains(matrix.BROWSER, 'chrome') }}
@@ -88,6 +87,7 @@ jobs:
           chrome-version: ${{ matrix.CHROME_VERSION }}
           install-chromedriver: true
         id: setup-chrome
+
       - name: Verify Chrome Installation
         if: ${{ contains(matrix.BROWSER, 'chrome') }}
         run: |
@@ -102,21 +102,15 @@ jobs:
           sudo rm -f /usr/bin/${{ matrix.BROWSER }}
           sudo ln -s ${{ steps.setup-chrome.outputs.chrome-path }} /usr/bin/google-chrome
           sudo ln -s ${{ steps.setup-chrome.outputs.chrome-path }} /usr/bin/${{ matrix.BROWSER }}
-
       - name: Check Chrome Installation after overwriting system Chrome
         if: ${{ contains(matrix.BROWSER, 'chrome') }}
         run: |
           ${{ steps.setup-chrome.outputs.chrome-path }} --version
           ${{ matrix.BROWSER }} --version
           chrome --version
           google-chrome --version
-
-      # - name: Install Chrome Driver
-      #   if:  ${{ contains(matrix.BROWSER, 'chrome') }}
-      #   uses: browser-actions/setup-geckodriver@latest
-
       - name: Run Setup Script
-        run: ./scripts/setup_travis.sh
+        run: ./scripts/setup_ga_tests.sh
 
       - name: Run Tests
         run: ./scripts/run_travis.sh

scripts/run_travis.sh

@@ -22,12 +22,6 @@ else
     case $BROWSER in
       *chrome*)
         echo "Running tests on Chrome"
-        # check that chromedriver is now present
-        type chromedriver >/dev/null 2>&1 || {
-          echo "Failed to install ChromeDriver!"
-          exit 1
-        }
-        chromedriver --version
         run_selenium
         ;;
       *firefox*)

scripts/setup_ga_tests.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+toplevel=$(git rev-parse --show-toplevel)
+
+install_edge_webdriver() {
+  edge_version_major=$(microsoft-edge-beta --product-version | cut -d . -f 1)
+  edgedriver_version_url="https://msedgedriver.azureedge.net/LATEST_RELEASE_${edge_version_major}_LINUX"
+  edgedriver_version=$(curl -s "$edgedriver_version_url" | tr -d "\0\r\n" | cut -c 3-)
+  if [ -z "$edgedriver_version" ]; then
+    echo "Failed to retrieve Edge WebDriver version!"
+    exit 1
+  fi
+
+  echo "Installing Edge WebDriver version $edgedriver_version ..."
+  wget "https://msedgedriver.azureedge.net/${edgedriver_version}/edgedriver_linux64.zip"
+  unzip edgedriver_linux64.zip
+  sudo mv msedgedriver /usr/local/bin/
+  sudo chmod a+x /usr/local/bin/msedgedriver
+
+  # check that Edge WebDriver is now present
+  type msedgedriver >/dev/null 2>&1 || {
+    echo "Failed to install Edge WebDriver!"
+    exit 1
+  }
+}
+
+install_python_deps() {
+  pip install -r "$toplevel"/tests/requirements.txt
+}
+
+install_node_deps() {
+  # "--production" to skip installing devDependencies modules
+  npm ci --production || exit 1
+}
+
+# check that the desired browser is present as it might fail to install
+# for example: https://travis-ci.org/EFForg/privacybadger/jobs/362381214
+check_browser() {
+  type "$BROWSER" >/dev/null 2>&1 || {
+    echo "$BROWSER seems to be missing!"
+    exit 1
+  }
+
+  # print the version
+  echo "Found $("$BROWSER" --version)"
+}
+
+case $INFO in
+  *Chrome*)
+    check_browser
+    # check that chromedriver is present
+    type chromedriver >/dev/null 2>&1 || {
+        echo "Failed to install ChromeDriver!"
+        exit 1
+    }
+    chromedriver --version
+    install_python_deps
+    ;;
+  *Firefox*)
+    check_browser
+    install_geckodriver
+    install_python_deps
+    ;;
+  *Edge*)
+    check_browser
+    install_python_deps
+    ;;
+  *lint*)
+    install_node_deps
+    ;;
+  *)
+    echo "bad INFO variable, got $INFO"
+    exit 1
+    ;;
+esac

scripts/setup_travis.sh

@@ -79,13 +79,12 @@ check_browser() {
 case $INFO in
   *Chrome*)
     check_browser
-    # "$toplevel"/scripts/chromedriver.sh "$BROWSER" || exit 1
+    "$toplevel"/scripts/chromedriver.sh "$BROWSER" || exit 1
     install_python_deps
     ;;
   *Firefox*)
     check_browser
-    # sudo apt-get install -y xvfb
-    # install_geckodriver
+    install_geckodriver
     install_python_deps
     ;;
   *Edge*)

tests/selenium/pbtest.py

@@ -191,7 +191,6 @@ def edge_manager(self):
         opts = EdgeOptions()
         opts.add_argument("--load-extension=" + self.extension_path)
         opts.add_argument("--headless")
-        # opts.add_argument("--edge-skip-compat-layer-relaunch") # https://github.com/SeleniumHQ/selenium/issues/15340#issuecomment-2689372248
         opts.binary_location = self.browser_path
 
         for i in range(5):
@@ -239,10 +238,9 @@ def firefox_manager(self):
                 # to produce a trace-level geckodriver.log,
                 # remove the log_output argument to FirefoxService()
                 # and uncomment the line below
-                opts.log.level = "trace"
-                service = FirefoxService()
+                # opts.log.level = "trace"
 
-                # service = FirefoxService(log_output=os.path.devnull)
+                service = FirefoxService(log_output=os.path.devnull)
                 driver = webdriver.Firefox(options=opts, service=service)
 
             except WebDriverException as e: