From 02492685ccb1c3d4fee6180e704b565d045e58d4 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 19 Dec 2024 14:14:05 +0100
Subject: [PATCH 1/3] Use select_from_url test data from github, not
 usegalaxy.org

---
 lib/galaxy/tools/parameters/cancelable_request.py | 2 +-
 test/functional/tools/select_from_url.xml         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/galaxy/tools/parameters/cancelable_request.py b/lib/galaxy/tools/parameters/cancelable_request.py
index 794854a3ae62..17964b805108 100644
--- a/lib/galaxy/tools/parameters/cancelable_request.py
+++ b/lib/galaxy/tools/parameters/cancelable_request.py
@@ -23,7 +23,7 @@ async def fetch_url(
     method: REQUEST_METHOD = "GET",
 ):
     async with session.request(method=method, url=url, params=params, data=data, headers=headers) as response:
-        return await response.json()
+        return await response.json(content_type=None)
 
 
 async def async_request_with_timeout(
diff --git a/test/functional/tools/select_from_url.xml b/test/functional/tools/select_from_url.xml
index 488055677e85..09298605a894 100644
--- a/test/functional/tools/select_from_url.xml
+++ b/test/functional/tools/select_from_url.xml
@@ -7,12 +7,11 @@ echo '$url_param_value_header_and_body' > '$param_value_header_and_body'
     ]]></command>
     <inputs>
         <param name="url_param_value" type="select">
-            <options from_url="https://usegalaxy.org/api/genomes">
-            </options>
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/genomes.json"></options>
         </param>
         <param name="dynamic_param_filtered_with_validator" type="select">
             <!-- tested in test_build_module_filter_dynamic_select -->
-            <options from_url="https://usegalaxy.org/api/genomes">
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/genomes.json">
                 <filter type="param_value" ref="url_param_value" column="1" />
             </options>
             <validator type="no_options" message="Need at least one option here" />
@@ -24,14 +23,14 @@ echo '$url_param_value_header_and_body' > '$param_value_header_and_body'
         </param>
         -->
         <param name="url_param_value_postprocessed" type="select">
-            <options from_url="https://usegalaxy.org/api/genomes/dm6">
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/dm6.json">
                 <postprocess_expression type="ecma5.1"><![CDATA[
                     $( Object.values(inputs.chrom_info).map((v) => [v.chrom, v.len]) )
                 ]]></postprocess_expression>
             </options>
         </param>
         <param name="invalid_url_param_value_postprocessed" type="select">
-            <options from_url="https://usegalaxy.or/api/genomes/dm6">
+            <options from_url="https://usegalaxy.or">
                 <postprocess_expression type="ecma5.1"><![CDATA[${
                     if (inputs) {
                         return Object.values(inputs.chrom_info).map((v) => [v.chrom, v.len])

From 5c2a471afa04f0d7c4bc345b85d7324e1479af5b Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Thu, 19 Dec 2024 15:47:09 +0100
Subject: [PATCH 2/3] Fix branch reference

---
 test/functional/tools/select_from_url.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/tools/select_from_url.xml b/test/functional/tools/select_from_url.xml
index 09298605a894..b80f92642826 100644
--- a/test/functional/tools/select_from_url.xml
+++ b/test/functional/tools/select_from_url.xml
@@ -7,11 +7,11 @@ echo '$url_param_value_header_and_body' > '$param_value_header_and_body'
     ]]></command>
     <inputs>
         <param name="url_param_value" type="select">
-            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/genomes.json"></options>
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/master/genomes.json"></options>
         </param>
         <param name="dynamic_param_filtered_with_validator" type="select">
             <!-- tested in test_build_module_filter_dynamic_select -->
-            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/genomes.json">
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/master/genomes.json">
                 <filter type="param_value" ref="url_param_value" column="1" />
             </options>
             <validator type="no_options" message="Need at least one option here" />
@@ -23,7 +23,7 @@ echo '$url_param_value_header_and_body' > '$param_value_header_and_body'
         </param>
         -->
         <param name="url_param_value_postprocessed" type="select">
-            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/url_select/dm6.json">
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/master/genomes.json">
                 <postprocess_expression type="ecma5.1"><![CDATA[
                     $( Object.values(inputs.chrom_info).map((v) => [v.chrom, v.len]) )
                 ]]></postprocess_expression>

From d66555ec1eb4b3e62c77bd49c121aa76483fb486 Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Thu, 19 Dec 2024 16:54:03 +0100
Subject: [PATCH 3/3] ...

Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
---
 test/functional/tools/select_from_url.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/tools/select_from_url.xml b/test/functional/tools/select_from_url.xml
index b80f92642826..81aced1695d4 100644
--- a/test/functional/tools/select_from_url.xml
+++ b/test/functional/tools/select_from_url.xml
@@ -23,7 +23,7 @@ echo '$url_param_value_header_and_body' > '$param_value_header_and_body'
         </param>
         -->
         <param name="url_param_value_postprocessed" type="select">
-            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/master/genomes.json">
+            <options from_url="https://raw.githubusercontent.com/galaxyproject/galaxy-test-data/refs/heads/master/dm6.json">
                 <postprocess_expression type="ecma5.1"><![CDATA[
                     $( Object.values(inputs.chrom_info).map((v) => [v.chrom, v.len]) )
                 ]]></postprocess_expression>