[chore] Enabling and fixing tests in spp_starter that were marked as failing on CI

Author: kneckinator

spp_starter/__manifest__.py

@@ -7,7 +7,7 @@
     "license": "LGPL-3",
     "development_status": "Beta",
     "maintainers": ["jeremi", "gonzalesedwin1123"],
-    "depends": ["base"],
+    "depends": ["base", "product"],
     "data": [
         "security/ir.model.access.csv",
         "wizards/spp_starter_views.xml",

spp_starter/tests/test_spp_starter.py

@@ -1,4 +1,4 @@
-from odoo.tests import TransactionCase, tagged
+from odoo.tests import TransactionCase, patch, tagged
 from odoo.tools.safe_eval import safe_eval
 
 
@@ -10,9 +10,9 @@ def setUpClass(cls):
         cls.sgd = cls.env.ref("base.SGD").id
         cls.test_record = cls.env["spp.starter"].create(
             {
-                "org_name": "Newlogic",
-                "org_address": "160 Robinson Rd #14-04 SBF Centre Singapore 068914",
-                "org_phone": "+65 3138 4664",
+                "org_name": "The Company",
+                "org_address": "The Address, 12345, Country",
+                "org_phone": "+1234567890",
                 "org_currency_id": cls.sgd,
             }
         )
@@ -97,8 +97,12 @@ def test_04_remove_fake_apps_menu(self):
 
     def test_05_remove_default_products_if_needed(self):
         self.test_record.conducting_inkind_transfer = "yes"
+        # Skip product-related tests if product module is not installed
         if "product.template" not in self.env:
-            self.test_record._remove_default_products_if_needed()
+            result = self.test_record._remove_default_products_if_needed()
+            self.assertIsNone(result)
+            return
+
         fake_product_template = self.env["product.template"].create(
             {
                 "name": "Fake Test Product",
@@ -122,30 +126,35 @@ def test_07_adjust_main_company_details(self):
         self.assertEqual(company.phone, self.test_record.org_phone)
         self.assertEqual(company.currency_id, self.test_record.org_currency_id)
 
-    # TODO: removed below test cases because they are having errors in the CI
-    # but they are working fine in the local machine
-
-    # def test_08_install_modules(self):
-    #     def find_module(module_name):
-    #         return self.env.ref(f"base.module_{module_name}", raise_if_not_found=False)
-
-    #     spp_theme = find_module("theme_openspp_muk")
-    #     self.assertIn(spp_theme, self.test_record._install_modules())
-    #     gp2_individual = find_module("g2p_registry_individual")
-    #     gp2_group = find_module("g2p_registry_group")
-    #     self.test_record.managing_target = "group"
-    #     self.assertIn(gp2_group, self.test_record._install_modules())
-    #     self.test_record.managing_target = "individual"
-    #     self.assertIn(gp2_individual, self.test_record._install_modules())
-
-    # @patch("odoo.addons.base.models.ir_module.Module.button_immediate_install")
-    # def test_09_action_done(self, mock_button_immediate_install):
-    #     mock_button_immediate_install.return_value = None
-    #     action = self.test_record.action_done()
-    #     self.assertEqual(
-    #         action,
-    #         {
-    #             "type": "ir.actions.client",
-    #             "tag": "reload",
-    #         },
-    #     )
+    def test_08_install_modules(self):
+        def find_module(module_name):
+            return self.env.ref(f"base.module_{module_name}", raise_if_not_found=False)
+
+        # Test SP-MIS modules
+        self.test_record.registry_target = "spmis"
+        modules = self.test_record._install_modules()
+        self.assertTrue(modules, "Should return some modules for SP-MIS")
+
+        # Check for theme module which should always be available
+        theme_module = find_module("theme_openspp_muk")
+        self.assertIn(theme_module, modules, "Theme module should be included")
+
+        # Test Farmer Registry modules
+        self.test_record.registry_target = "farmer"
+        modules = self.test_record._install_modules()
+        self.assertTrue(modules, "Should return some modules for Farmer Registry")
+
+        # Check for theme module which should always be available
+        self.assertIn(theme_module, modules, "Theme module should be included")
+
+    @patch("odoo.addons.base.models.ir_module.Module.button_immediate_install")
+    def test_09_action_done(self, mock_button_immediate_install):
+        mock_button_immediate_install.return_value = None
+        action = self.test_record.action_done()
+        self.assertEqual(
+            action,
+            {
+                "type": "ir.actions.client",
+                "tag": "reload",
+            },
+        )

spp_starter/wizards/spp_starter.py

@@ -203,45 +203,66 @@ def _adjust_main_company_details(self):
             }
         )
 
+    def _find_module(self, module_name):
+        return self.env.ref(f"base.module_{module_name}", raise_if_not_found=False)
+
+    def _add_module_if_found(self, res, module_name):
+        if module := self._find_module(module_name):
+            res |= module
+        return res
+
+    def _install_spmis_base_modules(self, res):
+        for module_name in [
+            "spp_base",
+            "spp_programs",
+            "spp_change_request",
+            "spp_change_request_change_info",
+            "spp_event_data",
+        ]:
+            res = self._add_module_if_found(res, module_name)
+        return res
+
+    def _install_spmis_demo_modules(self, res):
+        if self.sp_mis_demo_management == "yes":
+            for module_name in ["spp_base_demo", "spp_mis_demo"]:
+                res = self._add_module_if_found(res, module_name)
+        return res
+
+    def _install_spmis_feature_modules(self, res):
+        module_map = {
+            "location_assignment": "spp_area",
+            "service_point_management": "spp_service_points",
+            "cash_transfer_needed": "spp_entitlement_cash",
+            "bank_details_needed": "g2p_bank",
+            "conducting_inkind_transfer": "spp_entitlement_in_kind",
+        }
+        for field, module_name in module_map.items():
+            if getattr(self, field) == "yes":
+                res = self._add_module_if_found(res, module_name)
+        return res
+
+    def _install_farmer_modules(self, res):
+        res = self._add_module_if_found(res, "spp_farmer_registry_base")
+        if self.location_assignment == "yes":
+            res = self._add_module_if_found(res, "spp_area_gis")
+        if self.farmer_demo_management == "yes":
+            for module_name in ["spp_base_demo", "spp_farmer_registry_demo", "spp_programs"]:
+                res = self._add_module_if_found(res, module_name)
+        return res
+
     def _install_modules(self):
         self.ensure_one()
+        res = self._find_module("theme_openspp_muk") or self.env["ir.module.module"]
 
-        def find_module(module_name):
-            return self.env.ref(f"base.module_{module_name}", raise_if_not_found=False)
-
-        res = find_module("theme_openspp_muk")
         if self.registry_target == "spmis":
-            res |= find_module("spp_base")
-            res |= find_module("spp_programs")
-            res |= find_module("spp_change_request")
-            res |= find_module("spp_change_request_change_info")
-            res |= find_module("spp_event_data")
-            if self.sp_mis_demo_management == "yes":
-                res |= find_module("spp_base_demo")
-                res |= find_module("spp_mis_demo")
-            if self.location_assignment == "yes":
-                res |= find_module("spp_area")
-            if self.service_point_management == "yes":
-                res |= find_module("spp_service_points")
-            if self.cash_transfer_needed == "yes":
-                res |= find_module("spp_entitlement_cash")
-            if self.bank_details_needed == "yes":
-                res |= find_module("g2p_bank")
-            if self.conducting_inkind_transfer == "yes":
-                res |= find_module("spp_entitlement_in_kind")
-
-        if self.registry_target == "farmer":
-            # TODO: needs to change this once the module for farmer registry default UI is created
-            res |= find_module("spp_farmer_registry_base")
-            if self.location_assignment == "yes":
-                res |= find_module("spp_area_gis")
-            if self.farmer_demo_management == "yes":
-                res |= find_module("spp_base_demo")
-                res |= find_module("spp_farmer_registry_demo")
-                res |= find_module("spp_programs")
+            res = self._install_spmis_base_modules(res)
+            res = self._install_spmis_demo_modules(res)
+            res = self._install_spmis_feature_modules(res)
+        elif self.registry_target == "farmer":
+            res = self._install_farmer_modules(res)
 
         if self.id_management == "yes":
-            res |= find_module("spp_idpass")
+            res = self._add_module_if_found(res, "spp_idpass")
 
         return res