[qa] Refactoring in docs, tests

Signed-off-by: DragnEmperor <[email protected]>

Author: DragnEmperor

docs/user/approximate-location.rst

@@ -6,7 +6,7 @@ Approximate Location
     The **Approximate Location** feature is **disabled by default**.
 
     Before enabling it, the :doc:`WHOIS Lookup feature <whois>` must be
-    enabled and then set
+    enabled. Then set
     :ref:`OPENWISP_CONTROLLER_APPROXIMATE_LOCATION_ENABLED` to ``True``
 
 .. contents:: **Table of contents**:
@@ -35,12 +35,12 @@ Approximate Location is triggered when:
 Behavior
 --------
 
-If **a matching location already exists** for another device with the same
-IP, the system will **attach that location** to the current device if:
+The system will **attach the already existing matching location** of
+another device with same ip to the current device if:
 
 - Only one device is found with that IP and it has a location.
-- The current device **has no location** or if it does then the location
-  is **approximate**.
+- The current device **has no location** or that location is
+  **approximate**.
 
 If there is **no matching location**, a new approximate location is
 created or the existing one is updated using coordinates from the WHOIS

openwisp_controller/geo/approximate_location/tasks.py

@@ -41,7 +41,7 @@ def _create_update_location():
         coords = Point(whois_obj.longitude, whois_obj.latitude, srid=4326)
         address = whois_obj.formatted_address
         location_name = (
-            ",".join(address.split(",")[:2]) + f" (Estimated: {ip_address})"
+            ",".join(address.split(",")[:2]) + f" (Estimated Location: {ip_address})"
             if address
             else f"Estimated Location: {ip_address}"
         )

openwisp_controller/geo/approximate_location/test_approximate_location.py

@@ -63,7 +63,7 @@ def test_approximate_location_configuration_setting(self):
 
         with self.subTest(
             "Test Approximate Location field visible on admin when "
-            "WHOIS_CONFIGURED True"
+            "WHOIS_CONFIGURED is True"
         ):
             self._login()
             org = self._get_org()
@@ -83,7 +83,7 @@ def test_approximate_location_configuration_setting(self):
             importlib.reload(config_app_settings)
             with self.subTest(
                 "Test Approximate Location field hidden on admin when "
-                "WHOIS_CONFIGURED False"
+                "WHOIS_CONFIGURED is False"
             ):
                 self._login()
                 org = self._get_org()
@@ -118,6 +118,7 @@ def test_approximate_location_task_called(
     ):
         connect_whois_handlers()
         mocked_client.return_value.city.return_value = self._mocked_client_response()
+
         self._task_called(
             mocked_approximate_location_task, task_name="Approximate location"
         )
@@ -144,15 +145,21 @@ def test_approximate_location_creation_and_update(self, mock_client):
         def _verify_location_details(device, mocked_response):
             location = device.devicelocation.location
             mocked_location = mocked_response.location
-            formatted_address = ", ".join(
+            address = ", ".join(
                 [
                     mocked_response.city.name,
                     mocked_response.country.name,
                     mocked_response.continent.name,
                     mocked_response.postal.code,
                 ]
             )
-            self.assertEqual(location.address, formatted_address)
+            ip_address = mocked_response.ip_address or device.last_ip
+            location_name = (
+                ",".join(address.split(",")[:2])
+                + f" (Estimated Location: {ip_address})"
+            )
+            self.assertEqual(location.name, location_name)
+            self.assertEqual(location.address, address)
             self.assertEqual(
                 location.geometry,
                 GEOSGeometry(
@@ -168,6 +175,7 @@ def _verify_location_details(device, mocked_response):
             device = self._create_device(last_ip="172.217.22.14")
 
             location = device.devicelocation.location
+            mocked_response.ip_address = device.last_ip
             self.assertEqual(location.is_approximate, True)
             self.assertEqual(location.is_mobile, False)
             self.assertEqual(location.type, "outdoor")
@@ -183,6 +191,7 @@ def _verify_location_details(device, mocked_response):
             device.refresh_from_db()
 
             location = device.devicelocation.location
+            mocked_response.ip_address = device.last_ip
             self.assertEqual(location.is_approximate, True)
             self.assertEqual(location.is_mobile, False)
             self.assertEqual(location.type, "outdoor")
@@ -191,6 +200,7 @@ def _verify_location_details(device, mocked_response):
         with self.subTest(
             "Test Location not updated if it is not approximate when last ip is updated"
         ):
+            mocked_response.ip_address = device.last_ip
             device.last_ip = "172.217.22.11"
             device.devicelocation.location.is_approximate = False
             mock_client.return_value.city.return_value = self._mocked_client_response()