fixup! split rbac tests

Author: gagantrivedi

api/tests/unit/features/feature_segments/test_unit_feature_segments_views.py

@@ -29,22 +29,24 @@
 from users.models import FFAdminUser
 
 
+@pytest.mark.skipif(
+    settings.IS_RBAC_INSTALLED is True,
+    reason="Skip this test if RBAC is installed",
+)
 @pytest.mark.parametrize(
-    "client,is_admin_master_api_key_client, num_queries",
+    "client, num_queries",
     [
         (
             lazy_fixture("admin_client"),
-            False,
             6,
         ),  # 1 for paging, 3 for permissions, 1 for result, 1 for getting the current live version
         (
             lazy_fixture("admin_master_api_key_client"),
-            True,
             4,
-        ),  # an extra one for master_api_key
+        ),  # one for each for master_api_key
     ],
 )
-def test_list_feature_segments(
+def test_list_feature_segments_without_rbac(
     segment: Segment,
     feature: Feature,
     environment: Environment,
@@ -53,16 +55,77 @@ def test_list_feature_segments(
     client: APIClient,
     feature_segment: FeatureSegment,
     num_queries: int,
-    is_admin_master_api_key_client: bool,
-):
+) -> None:
     # Given
-    if (
-        settings.IS_RBAC_INSTALLED and not is_admin_master_api_key_client
-    ):  # pragma: no cover
-        num_queries += 1
+    base_url = reverse("api-v1:features:feature-segment-list")
+    url = f"{base_url}?environment={environment.id}&feature={feature.id}"
+    list_feature_segment_setup_data(project, environment, feature, segment)
+
+    # When
+    with django_assert_num_queries(num_queries):
+        response = client.get(url)
 
+    # Then
+    assert response.status_code == status.HTTP_200_OK
+    response_json = response.json()
+    assert response_json["count"] == 3
+    for result in response_json["results"]:
+        assert result["environment"] == environment.id
+        assert "uuid" in result
+        assert "segment_name" in result
+        assert not result["is_feature_specific"]
+
+
+@pytest.mark.skipif(
+    settings.IS_RBAC_INSTALLED is False,
+    reason="Skip this test if RBAC is not installed",
+)
+@pytest.mark.parametrize(
+    "client, num_queries",
+    [
+        (
+            lazy_fixture("admin_client"),
+            7,
+        ),  # 1 for paging, 4 for permissions, 1 for result, 1 for getting the current live version
+        (
+            lazy_fixture("admin_master_api_key_client"),
+            4,
+        ),  # one for each for master_api_key
+    ],
+)
+def test_list_feature_segments_with_rbac(
+    segment: Segment,
+    feature: Feature,
+    environment: Environment,
+    project: Project,
+    django_assert_num_queries: DjangoAssertNumQueries,
+    client: APIClient,
+    feature_segment: FeatureSegment,
+    num_queries: int,
+) -> None:  # pragma: no cover
+    # Given
     base_url = reverse("api-v1:features:feature-segment-list")
     url = f"{base_url}?environment={environment.id}&feature={feature.id}"
+    list_feature_segment_setup_data(project, environment, feature, segment)
+
+    # When
+    with django_assert_num_queries(num_queries):
+        response = client.get(url)
+
+    # Then
+    assert response.status_code == status.HTTP_200_OK
+    response_json = response.json()
+    assert response_json["count"] == 3
+    for result in response_json["results"]:
+        assert result["environment"] == environment.id
+        assert "uuid" in result
+        assert "segment_name" in result
+        assert not result["is_feature_specific"]
+
+
+def list_feature_segment_setup_data(
+    project: Project, environment: Environment, feature: Feature, segment: Segment
+) -> None:
     environment_2 = Environment.objects.create(
         project=project, name="Test environment 2"
     )
@@ -79,20 +142,6 @@ def test_list_feature_segments(
         feature=feature, segment=segment, environment=environment_2
     )
 
-    # When
-    with django_assert_num_queries(num_queries):
-        response = client.get(url)
-
-    # Then
-    assert response.status_code == status.HTTP_200_OK
-    response_json = response.json()
-    assert response_json["count"] == 3
-    for result in response_json["results"]:
-        assert result["environment"] == environment.id
-        assert "uuid" in result
-        assert "segment_name" in result
-        assert not result["is_feature_specific"]
-
 
 @pytest.mark.parametrize(
     "client",