From d28e1055cc0591f5f4a78e63fb81d86d47e6f5a7 Mon Sep 17 00:00:00 2001 From: Pia B Date: Tue, 4 Aug 2026 13:53:26 +0200 Subject: [PATCH] remove override fields and make only domain, categories and region mandatory --- .schema.yml | 7 ------- test_data/erroneous_files/all_valid_values_json.json | 2 -- test_data/erroneous_files/all_wrong_values.yml | 4 +--- test_data/erroneous_files/valid_with_extra_values.yaml | 4 +--- test_data/erroneous_files/valid_with_missing_fields.yaml | 4 +--- test_data/to_not_pass_linting.yml | 2 -- test_data/valid_files/all_valid_values_yaml.yaml | 2 -- test_data/valid_files/all_valid_values_yml.yml | 2 -- test_data/valid_files/minimum_valid_entries.yml | 7 +------ 9 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.schema.yml b/.schema.yml index a13b8e9..55ed048 100644 --- a/.schema.yml +++ b/.schema.yml @@ -1,20 +1,13 @@ type: object required: - domain -- override_description -- description - categories -- languages - region properties: domain: type: string - override_description: - type: boolean description: type: string - override_language: - type: boolean categories: type: array items: diff --git a/test_data/erroneous_files/all_valid_values_json.json b/test_data/erroneous_files/all_valid_values_json.json index ca7b0b5..ab4cf6e 100644 --- a/test_data/erroneous_files/all_valid_values_json.json +++ b/test_data/erroneous_files/all_valid_values_json.json @@ -1,9 +1,7 @@ --- // this file should not pass schema validation with wrong file type domain: cat.land -override_description: no description: a server where cats can share cute pictures of their humans -override_language: no categories: - food - furry diff --git a/test_data/erroneous_files/all_wrong_values.yml b/test_data/erroneous_files/all_wrong_values.yml index 8bbc4ce..d395354 100644 --- a/test_data/erroneous_files/all_wrong_values.yml +++ b/test_data/erroneous_files/all_wrong_values.yml @@ -1,9 +1,7 @@ --- -# this file should cause schema validator errors on all 8 fields +# this file should cause schema validator errors on all 6 fields domain: -override_description: nein description: -override_language: nein categories: - cats languages: diff --git a/test_data/erroneous_files/valid_with_extra_values.yaml b/test_data/erroneous_files/valid_with_extra_values.yaml index e80f4ce..68d4774 100644 --- a/test_data/erroneous_files/valid_with_extra_values.yaml +++ b/test_data/erroneous_files/valid_with_extra_values.yaml @@ -1,9 +1,7 @@ --- -# this file should pass schema validation on all fields +# this file should fail schema validation with extra fields domain: cat.land -override_description: no description: a server where cats can share cute pictures of their humans -override_language: no categories: - food - furry diff --git a/test_data/erroneous_files/valid_with_missing_fields.yaml b/test_data/erroneous_files/valid_with_missing_fields.yaml index 5dba19d..84a04cf 100644 --- a/test_data/erroneous_files/valid_with_missing_fields.yaml +++ b/test_data/erroneous_files/valid_with_missing_fields.yaml @@ -1,9 +1,7 @@ --- -# this file should pass schema validation on all fields +# this file should fail schema validation with missing field domain: cat.land -override_description: no description: a server where cats can share cute pictures of their humans -override_language: no categories: - food - furry diff --git a/test_data/to_not_pass_linting.yml b/test_data/to_not_pass_linting.yml index ca65af3..99aa3a2 100644 --- a/test_data/to_not_pass_linting.yml +++ b/test_data/to_not_pass_linting.yml @@ -1,9 +1,7 @@ --- # this file should cause schema validator errors on all 8 fields domain: cat.land -override_description: true description: a server where cats can share cute pictures of their humans -override_language: true categories: - food - furry diff --git a/test_data/valid_files/all_valid_values_yaml.yaml b/test_data/valid_files/all_valid_values_yaml.yaml index b385993..a8663bb 100644 --- a/test_data/valid_files/all_valid_values_yaml.yaml +++ b/test_data/valid_files/all_valid_values_yaml.yaml @@ -1,9 +1,7 @@ --- # this file should pass schema validation on all fields domain: cat.land -override_description: false description: a server where cats can share cute pictures of their humans -override_language: false categories: - food - furry diff --git a/test_data/valid_files/all_valid_values_yml.yml b/test_data/valid_files/all_valid_values_yml.yml index b385993..a8663bb 100644 --- a/test_data/valid_files/all_valid_values_yml.yml +++ b/test_data/valid_files/all_valid_values_yml.yml @@ -1,9 +1,7 @@ --- # this file should pass schema validation on all fields domain: cat.land -override_description: false description: a server where cats can share cute pictures of their humans -override_language: false categories: - food - furry diff --git a/test_data/valid_files/minimum_valid_entries.yml b/test_data/valid_files/minimum_valid_entries.yml index 9735b4d..82ed736 100644 --- a/test_data/valid_files/minimum_valid_entries.yml +++ b/test_data/valid_files/minimum_valid_entries.yml @@ -1,11 +1,6 @@ --- # this file should pass schema validation on all fields domain: test.domain -override_description: false -description: test test -override_language: categories: - games -languages: [] -region: '' -legal_body_type: +region: europe