PB-508: Fix variable names

geoadmin · Sep 12, 2024 · f975549 · f975549
1 parent 30789b6
commit f975549
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/icon_set.py b/app/icon_set.py
@@ -9,7 +9,7 @@
 from app.settings import COLORABLE_ICON_SETS
 from app.settings import ICON_SET_LANGUAGE
 from app.settings import IMAGE_FOLDER
-from app.settings import UNLISTED_SETS
+from app.settings import UNLISTED_ICON_SETS
 
 
 def get_icon_set(icon_set_name):
@@ -32,7 +32,7 @@ def get_all_icon_sets():
     for root, dirs, files in os.walk(IMAGE_FOLDER):
         for icon_set_name in dirs:
             # icons of legacy icon sets are still available, but the icon set will not be listed
-            if icon_set_name not in UNLISTED_SETS:
+            if icon_set_name not in UNLISTED_ICON_SETS:
                 icon_sets.append(get_icon_set(icon_set_name))
     return icon_sets
 

diff --git a/app/settings.py b/app/settings.py
@@ -16,8 +16,8 @@
 
 COLORABLE_ICON_SETS = ['default']
 LEGACY_ICON_SETS = []
-UNRELEASED_SETS = ['babs-de', 'babs-fr', 'babs-it']
-UNLISTED_SETS = LEGACY_ICON_SETS + UNRELEASED_SETS
+UNRELEASED_ICON_SETS = ['babs-de', 'babs-fr', 'babs-it']
+UNLISTED_ICON_SETS = LEGACY_ICON_SETS + UNRELEASED_ICON_SETS
 ICON_SET_LANGUAGE = {'babs-de': 'de', 'babs-fr': 'fr', 'babs-it': 'it'}
 DEFAULT_COLOR = {"r": '255', "g": '0', "b": '0'}
 DEFAULT_ICON_SIZE = 48

diff --git a/tests/unit_tests/test_all_icons.py b/tests/unit_tests/test_all_icons.py
@@ -13,7 +13,7 @@
 from app.settings import COLORABLE_ICON_SETS
 from app.settings import DEFAULT_ICON_SIZE
 from app.settings import IMAGE_FOLDER
-from app.settings import UNLISTED_SETS
+from app.settings import UNLISTED_ICON_SETS
 from tests.unit_tests.base_test import ServiceIconsUnitTests
 
 
@@ -158,10 +158,12 @@ def test_all_icon_sets_endpoint(self):
         self.assertIn('items', response.json)
         self.assertTrue(response.json['items'])
         icon_sets_from_endpoint = response.json['items']
-        self.assertEqual(len(icon_sets_from_endpoint), len(self.all_icon_sets) - len(UNLISTED_SETS))
-        for legacy_icon_set in UNLISTED_SETS:
+        self.assertEqual(
+            len(icon_sets_from_endpoint), len(self.all_icon_sets) - len(UNLISTED_ICON_SETS)
+        )
+        for unlisted_icon_set in UNLISTED_ICON_SETS:
             self.assertNotIn(
-                legacy_icon_set, icon_sets_from_endpoint, msg="Icon set should not be listed"
+                unlisted_icon_set, icon_sets_from_endpoint, msg="Icon set should not be listed"
             )
         for icon_set in icon_sets_from_endpoint:
             self.assertIn('name', icon_set)