diff --git a/changedetectionio/templates/watch-overview.html b/changedetectionio/templates/watch-overview.html
index 5e2cc090..4b04ead0 100644
--- a/changedetectionio/templates/watch-overview.html
+++ b/changedetectionio/templates/watch-overview.html
@@ -104,8 +104,9 @@
{% if watch.get_fetch_backend == "html_webdriver"
or ( watch.get_fetch_backend == "system" and system_default_fetcher == 'html_webdriver' )
+ or "extra_browser_" in watch.get_fetch_backend
%}
- }} "Using a chrome browser")
+
{% endif %}
{%if watch.is_pdf %}}} "Converting PDF to text")
{% endif %}
diff --git a/changedetectionio/tests/custom_browser_url/__init__.py b/changedetectionio/tests/custom_browser_url/__init__.py
new file mode 100644
index 00000000..f4572339
--- /dev/null
+++ b/changedetectionio/tests/custom_browser_url/__init__.py
@@ -0,0 +1 @@
+# placeholder
\ No newline at end of file
diff --git a/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py b/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py
new file mode 100644
index 00000000..bfc2c95e
--- /dev/null
+++ b/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py
@@ -0,0 +1,89 @@
+# !/usr/bin/python3
+import os
+
+from flask import url_for
+from ..util import live_server_setup, wait_for_all_checks
+
+def do_test(client, live_server, make_test_use_extra_browser=False):
+
+ # Grep for this string in the logs?
+ test_url = f"https://changedetection.io/ci-test.html"
+ custom_browser_name = 'custom browser URL'
+
+ # needs to be set and something like 'ws://127.0.0.1:3000?stealth=1&--disable-web-security=true'
+ assert os.getenv('PLAYWRIGHT_DRIVER_URL'), "Needs PLAYWRIGHT_DRIVER_URL set for this test"
+
+ #####################
+ res = client.post(
+ url_for("settings_page"),
+ data={"application-empty_pages_are_a_change": "",
+ "requests-time_between_check-minutes": 180,
+ 'application-fetch_backend': "html_webdriver",
+ # browserless-custom-url is setup in .github/workflows/test-only.yml
+ # the test script run_custom_browser_url_test.sh will look for 'custom-browser-search-string' in the container logs
+ 'requests-extra_browsers-0-browser_connection_url': 'ws://browserless-custom-url:3000?stealth=1&--disable-web-security=true&custom-browser-search-string=1',
+ 'requests-extra_browsers-0-browser_name': custom_browser_name
+ },
+ follow_redirects=True
+ )
+
+ assert b"Settings updated." in res.data
+
+ # Add our URL to the import page
+ res = client.post(
+ url_for("import_page"),
+ data={"urls": test_url},
+ follow_redirects=True
+ )
+
+ assert b"1 Imported" in res.data
+ wait_for_all_checks(client)
+
+ if make_test_use_extra_browser:
+
+ # So the name should appear in the edit page under "Request" > "Fetch Method"
+ res = client.get(
+ url_for("edit_page", uuid="first"),
+ follow_redirects=True
+ )
+ assert b'custom browser URL' in res.data
+
+ res = client.post(
+ url_for("edit_page", uuid="first"),
+ data={
+ "url": test_url,
+ "tags": "",
+ "headers": "",
+ 'fetch_backend': f"extra_browser_{custom_browser_name}",
+ 'webdriver_js_execute_code': ''
+ },
+ follow_redirects=True
+ )
+
+ assert b"Updated watch." in res.data
+ wait_for_all_checks(client)
+
+ # Force recheck
+ res = client.get(url_for("form_watch_checknow"), follow_redirects=True)
+ assert b'1 watches queued for rechecking.' in res.data
+
+ wait_for_all_checks(client)
+
+ res = client.get(
+ url_for("preview_page", uuid="first"),
+ follow_redirects=True
+ )
+ assert b'cool it works' in res.data
+
+
+# Requires playwright to be installed
+def test_request_via_custom_browser_url(client, live_server):
+ live_server_setup(live_server)
+ # We do this so we can grep the logs of the custom container and see if the request actually went through that container
+ do_test(client, live_server, make_test_use_extra_browser=True)
+
+
+def test_request_not_via_custom_browser_url(client, live_server):
+ live_server_setup(live_server)
+ # We do this so we can grep the logs of the custom container and see if the request actually went through that container
+ do_test(client, live_server, make_test_use_extra_browser=False)
+
{% endif %}
{%if watch.is_pdf %}{% endif %}
diff --git a/changedetectionio/tests/custom_browser_url/__init__.py b/changedetectionio/tests/custom_browser_url/__init__.py
new file mode 100644
index 00000000..f4572339
--- /dev/null
+++ b/changedetectionio/tests/custom_browser_url/__init__.py
@@ -0,0 +1 @@
+# placeholder
\ No newline at end of file
diff --git a/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py b/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py
new file mode 100644
index 00000000..bfc2c95e
--- /dev/null
+++ b/changedetectionio/tests/custom_browser_url/test_custom_browser_url.py
@@ -0,0 +1,89 @@
+# !/usr/bin/python3
+import os
+
+from flask import url_for
+from ..util import live_server_setup, wait_for_all_checks
+
+def do_test(client, live_server, make_test_use_extra_browser=False):
+
+ # Grep for this string in the logs?
+ test_url = f"https://changedetection.io/ci-test.html"
+ custom_browser_name = 'custom browser URL'
+
+ # needs to be set and something like 'ws://127.0.0.1:3000?stealth=1&--disable-web-security=true'
+ assert os.getenv('PLAYWRIGHT_DRIVER_URL'), "Needs PLAYWRIGHT_DRIVER_URL set for this test"
+
+ #####################
+ res = client.post(
+ url_for("settings_page"),
+ data={"application-empty_pages_are_a_change": "",
+ "requests-time_between_check-minutes": 180,
+ 'application-fetch_backend': "html_webdriver",
+ # browserless-custom-url is setup in .github/workflows/test-only.yml
+ # the test script run_custom_browser_url_test.sh will look for 'custom-browser-search-string' in the container logs
+ 'requests-extra_browsers-0-browser_connection_url': 'ws://browserless-custom-url:3000?stealth=1&--disable-web-security=true&custom-browser-search-string=1',
+ 'requests-extra_browsers-0-browser_name': custom_browser_name
+ },
+ follow_redirects=True
+ )
+
+ assert b"Settings updated." in res.data
+
+ # Add our URL to the import page
+ res = client.post(
+ url_for("import_page"),
+ data={"urls": test_url},
+ follow_redirects=True
+ )
+
+ assert b"1 Imported" in res.data
+ wait_for_all_checks(client)
+
+ if make_test_use_extra_browser:
+
+ # So the name should appear in the edit page under "Request" > "Fetch Method"
+ res = client.get(
+ url_for("edit_page", uuid="first"),
+ follow_redirects=True
+ )
+ assert b'custom browser URL' in res.data
+
+ res = client.post(
+ url_for("edit_page", uuid="first"),
+ data={
+ "url": test_url,
+ "tags": "",
+ "headers": "",
+ 'fetch_backend': f"extra_browser_{custom_browser_name}",
+ 'webdriver_js_execute_code': ''
+ },
+ follow_redirects=True
+ )
+
+ assert b"Updated watch." in res.data
+ wait_for_all_checks(client)
+
+ # Force recheck
+ res = client.get(url_for("form_watch_checknow"), follow_redirects=True)
+ assert b'1 watches queued for rechecking.' in res.data
+
+ wait_for_all_checks(client)
+
+ res = client.get(
+ url_for("preview_page", uuid="first"),
+ follow_redirects=True
+ )
+ assert b'cool it works' in res.data
+
+
+# Requires playwright to be installed
+def test_request_via_custom_browser_url(client, live_server):
+ live_server_setup(live_server)
+ # We do this so we can grep the logs of the custom container and see if the request actually went through that container
+ do_test(client, live_server, make_test_use_extra_browser=True)
+
+
+def test_request_not_via_custom_browser_url(client, live_server):
+ live_server_setup(live_server)
+ # We do this so we can grep the logs of the custom container and see if the request actually went through that container
+ do_test(client, live_server, make_test_use_extra_browser=False)