test(devops): Update feature flag test case setup to enable feature flag for testing software

ref: #662 #659

app/devops/tests/functional/feature_flag/test_functional_feature_flag_history.py

@@ -3,6 +3,9 @@ from django.test import TestCase
 from core.tests.abstract.test_functional_history import HistoryEntriesCommon
 
 from devops.models.feature_flag_history import FeatureFlag, FeatureFlagHistory
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
+
+from itam.models.software import Software
 
 
 
@@ -22,14 +25,27 @@ class History(
         super().setUpTestData()
 
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
         self.obj = self.model.objects.create(
             organization = self.organization,
-            name = self.field_value_original
+            name = self.field_value_original,
+            software = software
         )
 
         self.obj_delete = self.model.objects.create(
             organization = self.organization,
-            name = self.field_value_delete
+            name = self.field_value_delete,
+            software = software
         )
 
         self.call_the_banners()

app/devops/tests/functional/feature_flag_notes/test_functional_feature_flag_notes_api_v2.py

@@ -4,6 +4,7 @@ from django.test import TestCase
 from core.tests.abstract.model_notes_api_fields import ModelNotesNotesAPIFields
 
 from devops.models.feature_flag_notes import FeatureFlag, FeatureFlagNotes
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
 
 from itam.models.software import Software
 
@@ -31,6 +32,17 @@ class NotesAPI(
 
         super().setUpTestData()
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
 
         self.item = self.model.objects.create(
             organization = self.organization,
@@ -42,10 +54,7 @@ class NotesAPI(
             model = FeatureFlag.objects.create(
                 organization = self.organization,
                 name = 'one',
-                software = Software.objects.create(
-                    organization = self.organization,
-                    name = 'soft',
-                ),
+                software = software,
                 description = 'desc',
                 model_notes = 'text',
                 enabled = True

app/devops/tests/functional/feature_flag_notes/test_functional_feature_flag_notes_viewset.py

@@ -1,6 +1,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
 from devops.viewsets.feature_flag_notes import ViewSet
 
 from core.tests.abstract.test_functional_notes_viewset import (
@@ -28,6 +29,17 @@ class ViewSetBase(
 
         super().setUpTestData()
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
         self.item = self.viewset.model.objects.create(
             organization = self.organization,
             content = 'a random comment',
@@ -38,10 +50,7 @@ class ViewSetBase(
             model = self.viewset.model.model.field.related_model.objects.create(
                 organization = self.organization,
                 name = 'one',
-                software = Software.objects.create(
-                    organization = self.organization,
-                    name = 'soft',
-                ),
+                software = software,
                 description = 'desc',
                 model_notes = 'text',
                 enabled = True
@@ -50,6 +59,17 @@ class ViewSetBase(
             modified_by = self.view_user,
         )
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'two',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
         self.other_org_item = self.viewset.model.objects.create(
             organization = self.different_organization,
             content = 'a random comment',
@@ -60,10 +80,7 @@ class ViewSetBase(
             model = self.viewset.model.model.field.related_model.objects.create(
                 organization = self.organization,
                 name = 'two',
-                software = Software.objects.create(
-                    organization = self.organization,
-                    name = 'soft two',
-                ),
+                software = software,
                 description = 'desc',
                 model_notes = 'text',
                 enabled = True
@@ -73,6 +90,12 @@ class ViewSetBase(
         )
 
 
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.global_organization,
+            software = software,
+            enabled = True
+        )
+
         self.global_org_item = self.viewset.model.objects.create(
             organization = self.global_organization,
             content = 'a random comment global_organization',
@@ -83,6 +106,10 @@ class ViewSetBase(
             model = self.viewset.model.model.field.related_model.objects.create(
                 organization = self.global_organization,
                 name = 'note model global_organization',
+                software = software,
+                description = 'desc',
+                model_notes = 'text',
+                enabled = True
             ),
             created_by = self.view_user,
             modified_by = self.view_user,

app/devops/tests/unit/feature_flag_notes/test_unit_feature_flag_notes_model.py

@@ -4,6 +4,7 @@ from django.test import TestCase
 from core.tests.abstract.test_unit_model_notes_model import ModelNotesModel
 
 from devops.models.feature_flag_notes import FeatureFlagNotes
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
 
 from itam.models.software import Software
 
@@ -23,6 +24,16 @@ class FeatureFlagNotesModel(
 
         super().setUpTestData()
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
 
         self.item = self.model.objects.create(
             organization = self.organization,
@@ -34,10 +45,7 @@ class FeatureFlagNotesModel(
             model = self.model.model.field.related_model.objects.create(
                 organization = self.organization,
                 name = 'one',
-                software = Software.objects.create(
-                    organization = self.organization,
-                    name = 'soft',
-                ),
+                software = software,
                 description = 'desc',
                 model_notes = 'text',
                 enabled = True

app/devops/tests/unit/feature_flag_notes/test_unit_feature_flag_notes_serializer.py

@@ -3,6 +3,7 @@ from django.test import TestCase
 
 from core.tests.abstract.test_unit_model_notes_serializer import ModelNotesSerializerTestCases
 
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
 from devops.serializers.feature_flag_notes import FeatureFlagNotes, FeatureFlagNoteModelSerializer
 
 from itam.models.software import Software
@@ -26,25 +27,43 @@ class ManufacturerNotesSerializer(
         super().setUpTestData()
 
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
+
         self.note_model = self.model.model.field.related_model.objects.create(
             organization = self.organization,
             name = 'one',
-            software = Software.objects.create(
-                organization = self.organization,
-                name = 'soft',
-            ),
+            software = software,
             description = 'desc',
             model_notes = 'text',
             enabled = True
         )
 
+
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft two',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
         self.note_model_two = self.model.model.field.related_model.objects.create(
             organization = self.organization,
             name = 'two',
-            software = Software.objects.create(
-                organization = self.organization,
-                name = 'soft two',
-            ),
+            software = software,
             description = 'desc',
             model_notes = 'text',
             enabled = True
@@ -61,6 +80,10 @@ class ManufacturerNotesSerializer(
             model = self.model.model.field.related_model.objects.create(
                 organization = self.organization,
                 name = 'note model existing item',
+                software = software,
+                description = 'desc',
+                model_notes = 'text',
+                enabled = True
             ),
             created_by = self.user_two,
         )

app/devops/tests/unit/feature_flag_notes/test_unit_feature_flag_notes_viewset.py

@@ -7,8 +7,12 @@ from access.models.organization import Organization
 
 from api.tests.abstract.viewsets import ViewSetModel
 
+from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag
 from devops.viewsets.feature_flag_notes import ViewSet
 
+from itam.models.software import Software
+
+
 
 class ViewsetCommon(
     ViewSetModel,
@@ -35,7 +39,7 @@ class ViewsetCommon(
 
 
 
-class ManufacturerNotesViewsetList(
+class NotesViewsetList(
     ViewsetCommon,
     TestCase,
 ):
@@ -53,9 +57,21 @@ class ManufacturerNotesViewsetList(
 
         super().setUpTestData()
 
+        software = Software.objects.create(
+            organization = self.organization,
+            name = 'soft',
+        )
+
+        SoftwareEnableFeatureFlag.objects.create(
+            organization = self.organization,
+            software = software,
+            enabled = True
+        )
+
         self.note_model = self.viewset.model.model.field.related_model.objects.create(
             organization = self.organization,
             name = 'note model',
+            software = software,
         )
 
         self.kwargs = {

app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_model.py

@@ -17,6 +17,7 @@ class Model(
 
     model = SoftwareEnableFeatureFlag
 
+    should_model_history_be_saved: bool = False
 
     @classmethod
     def setUpTestData(self):