corrected flag handling

Author: Christoffer Bäckström

tests/test_shortcut_exclude.py

@@ -341,7 +341,7 @@ def test_process_shortcuts_with_complex_regex_pattern(mock_fabric_workspace, moc
     assert published_shortcut["name"] == "prod_shortcut"
 
 
-def test_shortcut_smart_diff_skips_unchanged_shortcuts(mock_fabric_workspace, mock_item, restore_feature_flags):
+def test_shortcut_smart_diff_skips_unchanged_shortcuts(mock_fabric_workspace, mock_item):
     """Smart diff should skip publish for unchanged shortcuts."""
     shortcuts_data = [
         {
@@ -372,15 +372,16 @@ def test_shortcut_smart_diff_skips_unchanged_shortcuts(mock_fabric_workspace, mo
 
     mock_item.item_files = [create_shortcut_file(shortcuts_data)]
     set_deployed_shortcuts(mock_fabric_workspace, deployed_shortcuts)
-    constants.FEATURE_FLAG.add(FeatureFlag.ENABLE_SHORTCUT_SMART_DIFF.value)
+    constants.FEATURE_FLAG.add("enable_shortcut_smart_diff")
+    try:
+        ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
+        post_calls = get_shortcut_post_calls(mock_fabric_workspace)
+        assert len(post_calls) == 0
+    finally:
+        constants.FEATURE_FLAG.discard("enable_shortcut_smart_diff")
 
-    ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
-
-    post_calls = get_shortcut_post_calls(mock_fabric_workspace)
-    assert len(post_calls) == 0
 
-
-def test_shortcut_smart_diff_publishes_only_changed_shortcut(mock_fabric_workspace, mock_item, restore_feature_flags):
+def test_shortcut_smart_diff_publishes_only_changed_shortcut(mock_fabric_workspace, mock_item):
     """Smart diff should publish only shortcuts with changed fields."""
     shortcuts_data = [
         {
@@ -409,17 +410,19 @@ def test_shortcut_smart_diff_publishes_only_changed_shortcut(mock_fabric_workspa
 
     mock_item.item_files = [create_shortcut_file(shortcuts_data)]
     set_deployed_shortcuts(mock_fabric_workspace, deployed_shortcuts)
-    constants.FEATURE_FLAG.add(FeatureFlag.ENABLE_SHORTCUT_SMART_DIFF.value)
+    constants.FEATURE_FLAG.add("enable_shortcut_smart_diff")
+    try:
+        ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
 
-    ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
-
-    post_calls = get_shortcut_post_calls(mock_fabric_workspace)
-    assert len(post_calls) == 1
-    assert post_calls[0][1]["body"]["name"] == "shortcut2"
+        post_calls = get_shortcut_post_calls(mock_fabric_workspace)
+        assert len(post_calls) == 1
+        assert post_calls[0][1]["body"]["name"] == "shortcut2"
+    finally:
+        constants.FEATURE_FLAG.discard("enable_shortcut_smart_diff")
 
 
 def test_shortcut_smart_diff_publishes_client_side_new_field(
-    mock_fabric_workspace, mock_item, restore_feature_flags
+    mock_fabric_workspace, mock_item
 ):
     """Smart diff should publish when repo contains a new field missing from deployed shortcut."""
     shortcuts_data = [
@@ -440,17 +443,19 @@ def test_shortcut_smart_diff_publishes_client_side_new_field(
 
     mock_item.item_files = [create_shortcut_file(shortcuts_data)]
     set_deployed_shortcuts(mock_fabric_workspace, deployed_shortcuts)
-    constants.FEATURE_FLAG.add(FeatureFlag.ENABLE_SHORTCUT_SMART_DIFF.value)
-
-    ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
+    constants.FEATURE_FLAG.add("enable_shortcut_smart_diff")
+    try:
+        ShortcutPublisher(mock_fabric_workspace, mock_item).publish_all()
 
-    post_calls = get_shortcut_post_calls(mock_fabric_workspace)
-    assert len(post_calls) == 1
-    assert post_calls[0][1]["body"]["name"] == "shortcut1"
+        post_calls = get_shortcut_post_calls(mock_fabric_workspace)
+        assert len(post_calls) == 1
+        assert post_calls[0][1]["body"]["name"] == "shortcut1"
+    finally:
+        constants.FEATURE_FLAG.discard("enable_shortcut_smart_diff")
 
 
 def test_shortcut_smart_diff_disabled_keeps_publish_all_behavior(
-    mock_fabric_workspace, mock_item, restore_feature_flags
+    mock_fabric_workspace, mock_item
 ):
     """When smart diff is disabled, unchanged shortcuts are still published."""
     shortcuts_data = [