Merge branch 'reduce-bash-tests'

Author: Skillkiller

.github/workflows/jekyll-gh-pages.yml

@@ -22,26 +22,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Test files
-        run: |
-          for s in $(find -type f -name "*.ics" -print); do
-            echo "::group::Test file $s";
-            echo "Make http request"
-            response=$(curl -sS -F "jform[task]=validate" -F "jform[ical_file]=@$s" "https://icalendar.org/validator.html?json=1")
-            echo "::debug::$response"
-            error_count=$(echo "$response" | jq '.totals.errors')
-            warning_count=$(echo "$response" | jq '.totals.warnings')
-            echo "File has $error_count errors and $warning_count warnings."
-            if [ "$error_count" -gt "0" ]; then
-              echo "::error title=Error found::$(echo "$response" | jq -r '.errors | map(.message) | join("\n")')"
-              exit 1
-            fi
-            if [ "$warning_count" -gt "0" ]; then
-              echo "::warning title=Warning found::$(echo "$response" | jq -r '.warnings | map(.message) | join("\n")')"
-              exit 2
-            fi
-            echo "::endgroup::"
-          done
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

tests/requirements.txt

@@ -1,7 +1,11 @@
 import pytest
 import os
+
+import requests
 from icalendar import Calendar
 
+ICAL_VALIDATOR_URL = "https://icalendar.org/validator.html?json=1"
+
 def find_ics_files(base_path='./'):
     ics_files = []
     for root, _, files in os.walk(base_path):
@@ -41,3 +45,25 @@ def test_calendar_name_matches_filename_with_suffix(parsed_calendar):
     expected_name = build_expected_calendar_name(path)
     assert cal_name == expected_name, f"Expected calendar name '{expected_name}', but found '{cal_name}' (NAME) in {path}"
     assert x_wr_cal_name == expected_name, f"Expected calendar name '{expected_name}', but found '{x_wr_cal_name}' (X-WR-CALNAME) in {path}"
+
+@pytest.mark.parametrize("ics_path", find_ics_files())
+def test_icalendar_org_validator(ics_path):
+    with open(ics_path, 'rb') as f:
+        files = {
+            "jform[task]": (None, "validate"),
+            "jform[ical_file]": (os.path.basename(ics_path), f, "text/calendar"),
+        }
+        response = requests.post(ICAL_VALIDATOR_URL, files=files)
+        response.raise_for_status()
+        data = response.json()
+
+    errors = data.get("totals", {}).get("errors", 0)
+    warnings = data.get("totals", {}).get("warnings", 0)
+
+    if errors > 0:
+        messages = "\n".join(err["message"] for err in data.get("errors", []))
+        pytest.fail(f"Validation errors in {ics_path}:\n{messages}")
+
+    if warnings > 0:
+        messages = "\n".join(warn["message"] for warn in data.get("warnings", []))
+        pytest.skip(f"Validation warnings in {ics_path}:\n{messages}")