@@ -867,7 +867,6 @@ def setUp(self) -> None:
867867 self .group_event = GroupEvent .from_event (self .event , self .group )
868868
869869 def test_activity_update (self ) -> None :
870- # only picks up metric detector because the group type does not enable the issue stream detector
871870 activity = Activity .objects .create (
872871 project = self .project ,
873872 group = self .group ,
@@ -878,7 +877,7 @@ def test_activity_update(self) -> None:
878877 result = get_detectors_for_event_data (event_data , detector = self .detector )
879878 assert result is not None
880879 assert result .preferred_detector == self .detector
881- assert result .detectors == {self .detector }
880+ assert result .detectors == {self .issue_stream_detector , self . detector }
882881
883882 def test_error_group_type (self ) -> None :
884883 # default behavior for a group type is to pick up the issue stream detector
@@ -896,30 +895,6 @@ def test_metric_issue(self) -> None:
896895 result = get_detectors_for_event_data (event_data )
897896 assert result is not None
898897 assert result .preferred_detector == self .detector
899- assert result .detectors == {self .detector }
900-
901- def test_metric_issue_with_feature_flag (self ) -> None :
902- self .group_event .occurrence = self .occurrence
903-
904- event_data = WorkflowEventData (event = self .group_event , group = self .group )
905- with self .feature ("organizations:workflow-engine-metric-issue-ui" ):
906- result = get_detectors_for_event_data (event_data )
907- assert result is not None
908- assert result .preferred_detector == self .detector
909- assert result .detectors == {self .issue_stream_detector , self .detector }
910-
911- def test_activity_update_with_feature_flag (self ) -> None :
912- activity = Activity .objects .create (
913- project = self .project ,
914- group = self .group ,
915- type = ActivityType .SET_RESOLVED .value ,
916- user_id = self .user .id ,
917- )
918- event_data = WorkflowEventData (event = activity , group = self .group )
919- with self .feature ("organizations:workflow-engine-metric-issue-ui" ):
920- result = get_detectors_for_event_data (event_data , detector = self .detector )
921- assert result is not None
922- assert result .preferred_detector == self .detector
923898 assert result .detectors == {self .issue_stream_detector , self .detector }
924899
925900 def test_metric_issue_with_disable_detector_flag (self ) -> None :
@@ -928,18 +903,15 @@ def test_metric_issue_with_disable_detector_flag(self) -> None:
928903
929904 event_data = WorkflowEventData (event = self .group_event , group = self .group )
930905 with self .feature (
931- {
932- "organizations:workflow-engine-metric-issue-ui" : True ,
933- "organizations:workflow-engine-metric-issue-disable-issue-detector-notifications" : True ,
934- }
906+ "organizations:workflow-engine-metric-issue-disable-issue-detector-notifications"
935907 ):
936908 result = get_detectors_for_event_data (event_data )
937909 assert result is not None
938910 assert result .preferred_detector == self .detector
939911 assert result .detectors == {self .detector }
940912
941- def test_non_metric_issue_in_disable_list_with_feature_flag (self ) -> None :
942- """Feature flag override only applies to MetricIssue, not other disabled group types."""
913+ def test_non_metric_issue_in_disable_list (self ) -> None :
914+ """Disable override only applies to MetricIssue, not other disabled group types."""
943915 self .group .update (type = FeedbackGroup .type_id )
944916 activity = Activity .objects .create (
945917 project = self .project ,
@@ -948,16 +920,13 @@ def test_non_metric_issue_in_disable_list_with_feature_flag(self) -> None:
948920 user_id = self .user .id ,
949921 )
950922 event_data = WorkflowEventData (event = activity , group = self .group )
951- with (
952- self .feature ("organizations:workflow-engine-metric-issue-ui" ),
953- self .options (
954- {
955- "workflow_engine.group.type_id.disable_issue_stream_detector" : [
956- MetricIssue .type_id ,
957- FeedbackGroup .type_id ,
958- ]
959- }
960- ),
923+ with self .options (
924+ {
925+ "workflow_engine.group.type_id.disable_issue_stream_detector" : [
926+ MetricIssue .type_id ,
927+ FeedbackGroup .type_id ,
928+ ]
929+ }
961930 ):
962931 result = get_detectors_for_event_data (event_data )
963932 assert result is None
0 commit comments