Merge pull request #36 from pwyf/activity-scope-split

test defns: Split location into with/without activity-scope exclusion
pwyf · Nov 8, 2023 · a544984 · a544984
2 parents 2700d32 + bff1f98
commit a544984
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/test_definitions/project_attributes/21_sub-national_location.feature b/test_definitions/project_attributes/21_sub-national_location.feature
@@ -4,8 +4,6 @@ Feature: Sub-national location
   Scenario Outline: Location (sub-national)
     Given an IATI activity
      And the activity is current
-     # The exclusion on the next line will only apply for some organisations
-     And `activity-scope/@code` is not any of 1, 2, 3 or 4
      And `activity-status/@code` is one of 2, 3 or 4
      And `recipient-region/@code` is not 998
      And `default-aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01
@@ -15,8 +13,6 @@ Feature: Sub-national location
   Scenario Outline: Location (sub-national) point or administrative or location-id
     Given an IATI activity
      And the activity is current
-     # The exclusion on the next line will only apply for some organisations
-     And `activity-scope/@code` is not any of 1, 2, 3 or 4
      And `activity-status/@code` is one of 2, 3 or 4
      And `recipient-region/@code` is not 998
      And `default-aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01

diff --git a/..._definitions/project_attributes/21_sub-national_location_activity_scope_exclusion.feature b/..._definitions/project_attributes/21_sub-national_location_activity_scope_exclusion.feature
@@ -0,0 +1,24 @@
+@iati-activity
+Feature: Sub-national location (with activity-scope exclusion)
+
+  Scenario Outline: Location (sub-national) (with activity-scope exclusion)
+    Given an IATI activity
+     And the activity is current
+     # The exclusion on the next line will only apply for some organisations
+     And `activity-scope/@code` is not any of 1, 2, 3 or 4
+     And `activity-status/@code` is one of 2, 3 or 4
+     And `recipient-region/@code` is not 998
+     And `default-aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01
+     And `transaction/aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01
+     Then `location` should be present
+
+  Scenario Outline: Location (sub-national) point or administrative or location-id (with activity-scope exclusion)
+    Given an IATI activity
+     And the activity is current
+     # The exclusion on the next line will only apply for some organisations
+     And `activity-scope/@code` is not any of 1, 2, 3 or 4
+     And `activity-status/@code` is one of 2, 3 or 4
+     And `recipient-region/@code` is not 998
+     And `default-aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01
+     And `transaction/aid-type/@code` is not any of B01, B02, F01, H01, H02, H03, H04, H05 or G01
+     Then `location/point` should be present, or at least one `location/administrative/@vocabulary | location/location-id/@vocabulary` should be on the GeographicVocabulary codelist