fix: nutripatrol URL (#11115)

fixes #11097 --------- Co-authored-by: Open Food Facts Bot <contact@openfoodfacts.org>
openfoodfacts · Dec 13, 2024 · 8c1d123 · 8c1d123
1 parent 3854b77
commit 8c1d123
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/.env b/.env
@@ -74,7 +74,7 @@ ODOO_CRM_PASSWORD=
 
 # No need to have it running, it's just to compose a URL
 # you might also use the .net service
-NUTRIPATROL_URL=nutripatrol.localhost
+NUTRIPATROL_URL=http://nutripatrol.localhost
 
 BUILD_CACHE_REPO=openfoodfacts/openfoodfacts-build-cache
 

diff --git a/lib/ProductOpener/ConfigEnv.pm b/lib/ProductOpener/ConfigEnv.pm
@@ -33,5 +33,6 @@ BEGIN {
 use vars @EXPORT_OK;    # no 'my' keyword for these
 
 $nutripatrol_url = $ENV{NUTRIPATROL_URL};
+$nutripatrol_url =~ s/\///;    # remove trailing slash if there is one
 
 1;
diff --git a/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html b/tests/integration/expected_test_results/page_crawler/crawler-access-product-page.html
@@ -3514,7 +3514,7 @@ <h2 class="panel_title_card text-medium">Report a problem</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=0200000000235&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=0200000000235&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>

diff --git a/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html b/tests/integration/expected_test_results/page_crawler/normal-user-access-product-page.html
@@ -3514,7 +3514,7 @@ <h2 class="panel_title_card text-medium">Report a problem</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=0200000000235&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=0200000000235&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>

diff --git a/tests/integration/expected_test_results/product_read/get-existing-product.html b/tests/integration/expected_test_results/product_read/get-existing-product.html
@@ -4690,7 +4690,7 @@ <h2 class="panel_title_card text-medium">Report a problem</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=0200000000034&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=0200000000034&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>

diff --git a/tests/integration/expected_test_results/web_html/fr-product-2.html b/tests/integration/expected_test_results/web_html/fr-product-2.html
@@ -3657,7 +3657,7 @@ <h2 class="panel_title_card text-medium">Signaler un problème</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=3300000000002&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=3300000000002&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>

diff --git a/tests/integration/expected_test_results/web_html/fr-product.html b/tests/integration/expected_test_results/web_html/fr-product.html
@@ -3671,7 +3671,7 @@ <h2 class="panel_title_card text-medium">Signaler un problème</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=3300000000001&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=3300000000001&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>

diff --git a/tests/integration/expected_test_results/web_html/world-product.html b/tests/integration/expected_test_results/web_html/world-product.html
@@ -4245,7 +4245,7 @@ <h2 class="panel_title_card text-medium">Report a problem</h2>
 
         <div>
             <a class="button small action-report_product_to_nutripatrol"
-                href="nutripatrol.localhost/flag/product/?barcode=3300000000001&source=web&flavor=off">
+                href="http:/nutripatrol.localhost/flag/product/?barcode=3300000000001&source=web&flavor=off">
                 Report this product to our moderators
             </a>
         </div>