fix test

northdpole · northdpole · commit deb944b676b2 · 2025-03-30T19:04:16.000+01:00
diff --git a/application/tests/spreadsheet_test.py b/application/tests/spreadsheet_test.py
@@ -109,14 +109,22 @@ def test_prepare_spreadsheet(self) -> None:
         self.assertCountEqual(result, expected)
 
     def test_read_spreadsheet_iso_numbers(self) -> None:
-        url = "https://docs.google.com/spreadsheets/d/1eZOEYgts7d_-Dr-1oAbogPfzBLh6511b58pX3b59kvg"  # CRE spreadsheet url
+        url = "https://docs.google.com/spreadsheets/d/1ugU-FCIRLc5D_xpKOunelo26Wel3PTLnMKFdu7isZ3s"  # Public iso test CRE spreadsheet url
         alias = "Test Spreadsheet"
         result = read_spreadsheet(url, alias, validate=False, parse_numbered_only=False)
-
-        # Assuming the spreadsheet has a column "ISO Number" with values "7.10" and "8.20"
         expected = [
-            {"ISO Number": "7.10", "Name": "Example 1", "Value": 10},
-            {"ISO Number": "8.20", "Name": "Example 2", "Value": 20},
+            {
+                "Standard 27001/2:2022": "Use of cryptography",
+                "Standard 27001/2:2022 Section ID": "1.10",
+            },
+            {
+                "Standard 27001/2:2022": "Privacy and protection of personal identifiable information (PII)",
+                "Standard 27001/2:2022 Section ID": "10.10",
+            },
+            {
+                "Standard 27001/2:2022": "Secure development life cycle",
+                "Standard 27001/2:2022 Section ID": "1.31",
+            },
         ]
 
-        self.assertEqual(result["Sheet1"], expected)
+        self.assertEqual(result["ISO Numericise Test"], expected)
diff --git a/application/utils/spreadsheet.py b/application/utils/spreadsheet.py
@@ -59,13 +59,19 @@ def read_spreadsheet(
                     " will be processed by convention)" % wsh.title
                 )
                 records = wsh.get_all_records(
-                    head=1, numericise_ignore="all"  # Added numericise_ignore parameter
+                    head=1,
+                    numericise_ignore=list(
+                        range(1, wsh.col_count)
+                    ),  # Added numericise_ignore parameter
                 )  # workaround because of https://github.com/burnash/gspread/issues/1007 # this will break if the column names are in any other line
                 toyaml = yaml.safe_load(yaml.safe_dump(records))
                 result[wsh.title] = toyaml
             elif not parse_numbered_only:
                 records = wsh.get_all_records(
-                    head=1, numericise_ignore="all"  # Added numericise_ignore parameter
+                    head=1,
+                    numericise_ignore=list(
+                        range(1, wsh.col_count)
+                    ),  # Added numericise_ignore parameter -- DO NOT make this 'all', gspread has a bug
                 )  # workaround because of https://github.com/burnash/gspread/issues/1007 # this will break if the column names are in any other line
                 toyaml = yaml.safe_load(yaml.safe_dump(records))
                 result[wsh.title] = toyaml
