Merge pull request #4 from DemocracyClub/allow-ref

Add referendum to ELECTION_TYPES
DemocracyClub · Sep 13, 2021 · c579830 · c579830
2 parents 53e30d7 + 7cccc2e
commit c579830
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/tests/test_id_builder.py b/tests/test_id_builder.py
@@ -387,10 +387,6 @@ def test_eq_different_types(self):
         obj2 = 7
         self.assertNotEqual(obj1, obj2)
 
-    def test_ref(self):
-        with self.assertRaises(NotImplementedError):
-            IdBuilder("ref", date(2018, 5, 3))
-
     def test_none(self):
         id = (
             IdBuilder("local", date(2018, 5, 3))

diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -34,6 +34,7 @@ def test_valid_ids(self):
         self.assertTrue(validate("gla.c.barnet-and-camden.by.2016-05-05"))
         self.assertTrue(validate("europarl.2014-05-22"))
         self.assertTrue(validate("europarl.uk-wales.2014-05-22"))
+        self.assertTrue(validate("ref.croydon.2021-10-07"))
 
     def test_invalid_ids(self):
         self.assertFalse(validate(7))  # not string
@@ -54,7 +55,6 @@ def test_invalid_ids(self):
             validate("gla.r.barnet-and-camden.2016-05-05")
         )  # invalid subtype
         self.assertFalse(validate("naw.x.2019-01-01"))  # invalid subtype
-        self.assertFalse(validate("ref.2019-01-01"))  # not implemented
         # too many clauses
         self.assertFalse(validate("naw.r.mid-and-west-wales.something-else.2016-05-05"))
         self.assertFalse(validate("sp.c.shetland-islands.something-else.2019-08-29"))

diff --git a/uk_election_ids/datapackage.py b/uk_election_ids/datapackage.py
@@ -80,4 +80,11 @@
         "can_have_orgs": True,
         "can_have_divs": False,
     },
+    "ref": {
+        "name": "Referendum elections",
+        "subtypes": [],
+        "default_voting_system": "FPTP",
+        "can_have_orgs": True,
+        "can_have_divs": True,
+    },
 }
diff --git a/uk_election_ids/election_ids.py b/uk_election_ids/election_ids.py
@@ -89,8 +89,6 @@ def __init__(self, election_type, date):
         Returns:
             IdBuilder
         """
-        if election_type == "ref":
-            raise NotImplementedError()
         self._validate_election_type(election_type)
         self.election_type = election_type
         self.spec = RULES[self.election_type]