[fix] Fixed tests

Author: pandafy

openwisp_controller/config/whois/tests/tests.py

@@ -456,9 +456,8 @@ def test_process_whois_details_handles_missing_coordinates(self, mock_client):
     def test_fetch_whois_emits_signal(self, mock_client):
         connect_whois_handlers()
         mock_client.return_value.city.return_value = self._mocked_client_response()
-        device = self._create_device(last_ip="172.217.22.14")
         with catch_signal(whois_fetched) as handler:
-            fetch_whois_details(device_pk=device.pk, initial_ip_address=None)
+            self._create_device(last_ip="172.217.22.14")
         handler.assert_called()
 
     @mock.patch.object(app_settings, "WHOIS_CONFIGURED", True)

openwisp_controller/geo/apps.py

@@ -15,7 +15,6 @@
 from openwisp_utils.admin_theme import register_dashboard_chart
 from openwisp_utils.admin_theme.menu import register_menu_group
 
-from ..config import settings as config_app_settings
 from .estimated_location.handlers import (
     register_estimated_location_notification_types,
     whois_fetched_handler,
@@ -64,16 +63,15 @@ def connect_receivers(self):
             sender=self.org_geo_settings_model,
             dispatch_uid="invalidate_org_geo_settings_cache_on_delete",
         )
-        if config_app_settings.WHOIS_CONFIGURED:
-            # connect estimated location handler to whois_fetched signal
-            whois_fetched.connect(
-                whois_fetched_handler,
-                dispatch_uid="whois_fetched_estimated_location_handler",
-            )
-            whois_lookup_skipped.connect(
-                whois_lookup_skipped_handler,
-                dispatch_uid="whois_lookup_skipped_estimated_location_handler",
-            )
+        # connect estimated location handler to whois_fetched signal
+        whois_fetched.connect(
+            whois_fetched_handler,
+            dispatch_uid="whois_fetched_estimated_location_handler",
+        )
+        whois_lookup_skipped.connect(
+            whois_lookup_skipped_handler,
+            dispatch_uid="whois_lookup_skipped_estimated_location_handler",
+        )
 
     def _add_params_to_test_config(self):
         """

openwisp_controller/geo/estimated_location/service.py

@@ -8,8 +8,6 @@
 from openwisp_controller.config import settings as config_app_settings
 from openwisp_controller.config.whois.utils import send_whois_task_notification
 
-from .. import settings as geo_settings
-
 logger = logging.getLogger(__name__)
 
 

openwisp_controller/geo/estimated_location/tests/tests.py

@@ -93,6 +93,7 @@ def test_estimated_location_configuration_setting(self):
                     response, 'name="geo_settings-0-estimated_location_enabled"'
                 )
 
+    @mock.patch.object(config_app_settings, "WHOIS_CONFIGURED", True)
     def test_organization_geo_settings_validation(self):
         """Test OrganizationGeoSettings model validation."""
         org = self._get_org()
@@ -392,7 +393,7 @@ def _verify_location_details(device, mocked_response):
 
         with self.subTest("Test Estimated location created when device is created"):
             device = self._create_device(last_ip="172.217.22.14")
-            with self.assertNumQueries(14):
+            with self.assertNumQueries(13):
                 manage_estimated_locations(device.pk, device.last_ip)
             location = device.devicelocation.location
             mocked_response.ip_address = device.last_ip

openwisp_controller/geo/estimated_location/tests/utils.py

@@ -21,7 +21,9 @@ def setUp(self):
         # Ensure OrganizationGeoSettings exists (signals usually create it on
         # Organization creation, but make this explicit to avoid RelatedObject
         # errors in some test setups).
-        org_geo_settings, _ = OrganizationGeoSettings.objects.get_or_create(organization=org)
+        org_geo_settings, _ = OrganizationGeoSettings.objects.get_or_create(
+            organization=org
+        )
         org_geo_settings.estimated_location_enabled = True
         org_geo_settings.save()
 

openwisp_controller/geo/migrations/0005_organizationgeosettings.py

@@ -45,7 +45,7 @@ class Migration(migrations.Migration):
                     models.OneToOneField(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="geo_settings",
-                        to="openwisp_users.organization",
+                        to=swapper.get_model_name("openwisp_users", "Organization"),
                         verbose_name="organization",
                     ),
                 ),

openwisp_controller/geo/migrations/0006_create_geo_settings_for_existing_orgs.py

@@ -2,8 +2,9 @@
 
 from django.db import migrations
 
-from . import assign_geo_settings_permissions_to_groups
 from ...migrations import get_swapped_model
+from . import assign_geo_settings_permissions_to_groups
+
 
 def create_geo_settings_for_existing_orgs(apps, schema_editor):
     """

openwisp_controller/geo/tests/utils.py

@@ -21,7 +21,7 @@ def _create_organization(self, **kwargs):
 
     def _add_default_org(self, kwargs):
         if "organization" not in kwargs:
-            kwargs["organization"] = self._get_org()
+            kwargs["organization"] = self._create_organization()
         return kwargs
 
     def _create_object(self, **kwargs):

openwisp_controller/tests/mixins.py

@@ -11,6 +11,11 @@ def _get_org_edit_form_inline_params(self, user, org):
                 "config_settings-INITIAL_FORMS": 0,
                 "config_settings-MIN_NUM_FORMS": 0,
                 "config_settings-MAX_NUM_FORMS": 0,
+                # geo inline
+                "geo_settings-TOTAL_FORMS": 0,
+                "geo_settings-INITIAL_FORMS": 0,
+                "geo_settings-MIN_NUM_FORMS": 0,
+                "geo_settings-MAX_NUM_FORMS": 0,
                 # device limit inline
                 "config_limits-TOTAL_FORMS": 0,
                 "config_limits-INITIAL_FORMS": 0,

tests/openwisp2/sample_config/migrations/0009_organizationconfigsettings_approximate_location_enabled_and_more.py

@@ -13,18 +13,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AddField(
-            model_name="organizationconfigsettings",
-            name="estimated_location_enabled",
-            field=openwisp_utils.fields.FallbackBooleanChoiceField(
-                blank=True,
-                default=None,
-                fallback=False,
-                help_text="Whether the estimated location feature is enabled",
-                null=True,
-                verbose_name="Estimated Location Enabled",
-            ),
-        ),
         migrations.AddField(
             model_name="whoisinfo",
             name="coordinates",